[automerger skipped] DO NOT MERGE Fix broken test am: c8daad69 am: c95406fc am: 07a44678 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I805afcfb8640c45b79ca62fe0816d5e8926c643a