[automerger skipped] Merge "Merge Android 12 QPR1" am: 798e3d7d -s ours am: 50d6b616 -s ours am: 54916e10 -s ours

am skip reason: Merged-In Idd5fcfa840e2a5cb27b5d1c1131c80dd580da3ed with SHA-1 54ee717d is already in history

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

Change-Id: I39022c9f6e91c2722d2f78e8f19da0cd96488532