[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: 9d0eba50 -s ours am: eda6485a -s ours am: 56abf6d0 -s ours

am skip reason: Merged-In I62be3678022753eaba32209c33f95edf220294f1 with SHA-1 a4197a7a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1877901

Change-Id: Ifeae8b849e50c7a6874032bd5255e56c2f566e0b