[automerger skipped] More robust tests. am: 2a6cec96 am: ff5384f8 -s ours...

[automerger skipped] More robust tests. am: 2a6cec96 am: ff5384f8 -s ours am: d1a8496d -s ours am: 7e12ae12 -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/+/24137128



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