Merge "Update uiautomator references in frameworks/base/core/tests/coretests"