Merge "Update uiautomator references in...

Merge "Update uiautomator references in packages/PrintSpooler/tests/outofprocess" am: 5d97ee54 am: 85bce9ad

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



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