[automerger skipped] Merge "DO NOT MERGE Fix broken test" into...

[automerger skipped] Merge "DO NOT MERGE Fix broken test" into rvc-dev-plus-aosp am: 0d050d0f am: f7548e26 am: 8d286981 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3168bf1d14379ed35c2f4063743b4e21039f7579