Merge "Update uiautomator references in frameworks/base/tests/ActivityManagerPerfTests/utils" am: 6b982465e8

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

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