Merge "Merge "Fixup AccessibilityGestureDetectorTest" into android11-tests-dev am: ae996eb24a" into android12-tests-dev