Merge "Update uiautomator references in...

Merge "Update uiautomator references in frameworks/base/tests/ActivityManagerPerfTests/utils" am: 6b982465 am: 49e63138 am: 81c99faa

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



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