[automerger skipped] Merge "Mark ab/8191998 as merged" into...

[automerger skipped] Merge "Mark ab/8191998 as merged" into android12L-tests-dev am: b503c60a -s ours am: 6b4a52ad -s ours am: 13751790 -s ours am: 42f2e72c -s ours

am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 837917a6 is already in history

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

Change-Id: Ic96a05f5687fc6ec215e08206849020923aab400