[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: 5aca3e67 -s ours am: 2cbda411 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I709afa0aa56cf8e9e9eb99c8c06c9446a3e1ea91