Merge "Update uiautomator references in frameworks/base" am: b6d9367b am: 089f7d63

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



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