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

[automerger skipped] More robust tests. am: 2a6cec96 am: 5162f699 am: 9c366531 -s ours am: 7787c053 -s ours am: db7b81b0 -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: I2cd0b62b5540458b36164a289b9484831c2c8bec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>