[automerger skipped] Merge "Merge SP1A.211205.008" am: 0bf1802b am:...

[automerger skipped] Merge "Merge SP1A.211205.008" am: 0bf1802b am: 3be43ae1 -s ours am: 45c581df -s ours

am skip reason: Merged-In I84848a2801172b46f7cc3ff39d88ad57e34514a4 with SHA-1 050b6d52 is already in history

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

Change-Id: I664100f166a7dadf818f19c71f0c9cd593a8f757