Merge "Update uiautomator references in packages/apps/Settings/tests/unit" am:...

Merge "Update uiautomator references in packages/apps/Settings/tests/unit" am: 233c7084 am: a176782c

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



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