Merge "Update uiautomator references in packages/apps/Settings/tests/anomaly-tester"