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

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

Change-Id: I57d108c24027a44fcadee9ee54c69df9696916c8