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

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

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



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