[automerger skipped] More robust tests. am: 21683a93 -s ours am: bdf2b257...

[automerger skipped] More robust tests. am: 21683a93 -s ours am: bdf2b257 -s ours am: ffca85a9 -s ours am: 91e3e623 -s ours am: 25e08356 -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: Id74b1f0507204455c52fa31747ff988c9c92ad62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>