[automerger skipped] Merge changes from topic "BackportUiAutomatorRetry" am: ff062f6e am: ed29b2da am: 0c6faf40 am: e573aca0 -s ours

am skip reason: Change-Id Ibf201fa042b80c067f2a0c3b0bde23adf9c60546 with SHA-1 0d94533e is in history

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

Change-Id: Iacd7fb1171543f5b54aeac79b7e160133983baf3