[automerger skipped] Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE am: a2d1cd7262 -s ours

am skip reason: Merged-In I5ff5973c95868bee2b7444ecded7443d6e6429c9 with SHA-1 d24e3c5c42 is already in history

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

Change-Id: I7a7c89141b9e68270f2ed2e71fbaf8b076b6068c