[automerger skipped] [automerged blank] More robust tests. 2p: 21683a93 2p: 42c7debe am: 5b4a1ff4 -s ours am: b018db08 -s ours am: 3732a6e7 -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: Ia539cc55c11085879e2af1867cf5d7cd4c8dcf8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>