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

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



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