[automerger skipped] Merge "More robust tests." into tm-qpr-dev am: 5993338b...

[automerger skipped] Merge "More robust tests." into tm-qpr-dev am: 5993338b am: 6240f8d4 -s ours am: c08d4d59 -s ours am: c0ea4f5f -s ours

am skip reason: Merged-In Id68a28e9dc12f71286e29822d4b88be88ab03653 with SHA-1 18e9fa72 is already in history

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



Change-Id: Ic45e4908ab1a0bee4248b081645d20502b281faf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>