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