[automerger skipped] Merge Android 13 QPR2 am: d15a2d7e -s ours am:...

[automerger skipped] Merge Android 13 QPR2 am: d15a2d7e -s ours am: d19379e6 -s ours am: 8d7a6eb5 -s ours

am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9c is already in history

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



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