Merge "Update uiautomator references in packages/modules/Connectivity" am: 10f347c067

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2218884

Change-Id: Ice4a565001dcc1e997e408062c03bb368000af1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>