Merge "Update uiautomator references in packages/modules/Connectivity/tests/cts/hostside/app"