[automerger skipped] Merge "Merge Android 12 QPR1" am: f8ddc11cce -s ours

am skip reason: Merged-In I904aadc2fbbb180b57c1b7ff6454dbf0e510b38d with SHA-1 5da3a2ca0d is already in history

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

Change-Id: Ia3391c5b9059ba68cc50cd68eca56f9caa928472