[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: 982bb0f1 -s ours am: e043f7ed -s ours am: d70a5099 -s ours

am skip reason: Merged-In I7e267e3c046d726750180efa81806cbbefb17b68 with SHA-1 65f0c883 is already in history

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

Change-Id: Ibcc3d3fd32fed99c2bf7c844a32aad602d672286