Merge "Make tests more robust" into sc-v2-dev am: 94442f535f

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

Change-Id: I8faa4136f5b8d609717be89288c6a7c12244f136