[automerger skipped] Merge Android 12L am: bc78ce95 -s ours am: c4bfd10f -s ours am: 9d1287c9 -s ours am: 3a5cbdd4 -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: If213780421644563b5a0645cc939bbf7011db616