Merge "Update uiautomator references in base/apct-tests/perftests/blobstore"...

Merge "Update uiautomator references in base/apct-tests/perftests/blobstore" am: 6044b1c7 am: 047e4863 am: fa6fdd82 am: 0eecda20

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



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