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

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



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