Merge "Revert "Temporarily disable Launcher3 tests affected by fling changes"" into sc-v2-dev-plus-aosp