Merge "Fixup AccessibilityGestureDetectorTest" into android11-tests-dev