Merge "Update uiautomator references in base/apct-tests/perftests/blobstore" am: 6044b1c7

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



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