Merge "Revert "Temporarily disable Launcher3 tests affected by fling changes"" into stage-aosp-master