Merge "fix CTS: AccessibilityEndToEndTest failing" into mnc-dev