[automerger skipped] Merge "Merge Android 12" am: 965d0246 -s ours am:...

[automerger skipped] Merge "Merge Android 12" am: 965d0246 -s ours am: edc2ccbd -s ours am: b6537cbc -s ours am: c577daab -s ours am: 4039c5e4 -s ours

am skip reason: Merged-In I5c53eaff7cad32bd5879dfb7a66690425c8be912 with SHA-1 20c9b6a9 is already in history

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

Change-Id: I95d0611802559ac9e61e4f914009dbdd6cff2175