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