[automerger skipped] Merge "Merge Android 12L" am: 6eb3d3e7 -s ours am: 47b9cc5d -s ours am: 56bd0901 -s ours am: 96f90130 -s ours

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

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

Change-Id: I07429a525a187d497e1b47105b62aecaba27fe03