Merge "Snap for 15608475 from 50738a06c2e18414eb8c456ea4e29673b997442b to androidx-test-uiautomator-release" into androidx-test-uiautomator-release