[automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 982bb0f145 -s ours am: 33fb8ae7 -s ours am: 8f9c6ca3 -s ours am: 70fcd24e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5330ff5530599eb9f78c81c8b5e1416334d3ecc0