[automerger skipped] Merge Android 12L am: bc78ce95a8 -s ours am: c4bfd10f9c -s ours am: 9d1287c9d8 -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: Ib6a97c56be77628f99b522abd17ff4ed89da5d44