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

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



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