Merge "[automerger skipped] More robust tests. am: 2a6cec96 am: 5162f699...

Merge "[automerger skipped] More robust tests. am: 2a6cec96 am: 5162f699 am: 9c366531 -s ours am: 7787c053 -s ours am: db7b81b0 -s ours" into udc-d1-dev-plus-aosp am: 592b7282 -s ours

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

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



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