[automerger skipped] Merge "Merge Android 12 QPR 3" am: a258d776 -s ours am: 403c3de8 -s ours

am skip reason: Merged-In Ie1e14a6b697af624854a9360a60383fac63bb02c with SHA-1 a5a729f5 is already in history

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



Change-Id: I5c7844643c9410751d52a366d2f2aa9c43439035
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>