Merge "Update uiautomator references in packages/modules/Connectivity/tests/cts/hostside/app" am: 043c7f07e4 am: 9158773ec1 am: 809f6b5566

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

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