Merge "Makes AccessibilityEventTest and homeScreenOrBust more robust." into android12-tests-dev