Merge changes from topic "BackportUiAutomatorRetry" am: ff062f6e73

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

Change-Id: I0de90a96abe80db87569aa7a8d53baf0135812e3