Merge "Update uiautomator references in...

Merge "Update uiautomator references in packages/apps/Settings/tests/perftests" am: 2fba2c23 am: 8d16e20d

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558350



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