[automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am:...

[automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: 05c15f8e -s ours am: 3e01c010 -s ours

am skip reason: Merged-In I2d14107a37340b8b34ae71c67f7f705a272324b9 with SHA-1 c61819e8 is already in history

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



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