Merge "Update uiautomator references in frameworks/base" am: b6d9367bc9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2219973

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