Merge "Update uiautomator references in packages/modules/Connectivity"