Merge "[automerger skipped] More robust tests. am: 2a6cec9647 am: 5162f69948 am: 9c36653159 -s ours am: 7787c0536e -s ours am: 309e8ae86d -s ours" into udc-d1-dev-plus-aosp am: b0eb34e781 -s ours am: 937552da5c -s ours

am skip reason: Merged-In Id68a28e9dc12f71286e29822d4b88be88ab03653 with SHA-1 2a6cec9647 is already in history

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

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