Merge changes from topic "BackportUiAutomatorRetry" am: ff062f6e73 am: ed29b2da3c am: 0c6faf40fd

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

Change-Id: I78fcebc34c06e43f607a566f2b3d2faa78f6520b