Merge "Update uiautomator references in frameworks/base/tests/ActivityManagerPerfTests/utils"