Merge "Snap for 11361858 from 1ca74e18d83468d6cadd32c67a7db1220e1033ac to androidx-test-uiautomator-release" into androidx-test-uiautomator-release