[automerger skipped] More robust tests. am: 21683a939f -s ours am: bdf2b257b6 -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/+/23114048
Change-Id: I198af9b1f55c99ba08f060feb2cd7682fdb0354e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: