[automerger skipped] Fix flaky tests am: 115d74f1 am: 4494f0e6 -s ours am: c89cabab -s ours

am skip reason: Merged-In I6546759ae1288abff967a4f624a90f3800687d5a with SHA-1 b136cea5 is already in history

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



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