[automerger skipped] Fix flaky tests am: 115d74f1aa am: 4494f0e6de -s ours

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

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

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