Merge "bug  3248277 android.webkit.AccessibilityInjectorTest tests are flaky on trygon"