Merge "Update uiautomator references in...

Merge "Update uiautomator references in frameworks/base/tests/WindowAnimationJank" am: 9a9bfd82 am: 60229aed am: 2c0df1b5

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



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