Merge "Update uiautomator references in packages/apps/Contacts/tests"