[automerger skipped] Merge "Merge Android 12" am: 43382525 -s ours am:...

[automerger skipped] Merge "Merge Android 12" am: 43382525 -s ours am: 7062f832 -s ours am: b2fadd3b -s ours

am skip reason: Merged-In Ib853137811901796f73e4d720accb3249a7db963 with SHA-1 8aa74d1a is already in history

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

Change-Id: I2034dc23c36bb8565dc8a0e4775da3851631004e