[automerger skipped] Merge "Merge Android 12L" am: 6eb3d3e7e2 -s ours am: 47b9cc5d8e -s ours

am skip reason: Merged-In I474c54f4117a6100b2c735f46a7a02b0b9c27e07 with SHA-1 51b68428bd is already in history

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

Change-Id: I470756b336d8cd575d634e8406a0d7e4bf0e7ffc