[automerger skipped] More robust tests. am: 2a6cec9647 am: ff5384f85c -s ours am: d1a8496de5 -s ours am: 7e12ae1254 -s ours

am skip reason: Merged-In Id68a28e9dc12f71286e29822d4b88be88ab03653 with SHA-1 18e9fa7232 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24137128

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