[automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 21cbf088 -s ours

am skip reason: Merged-In If6bec622f8a151011d81d0c0b158892a91be365d with SHA-1 b8b9606c is already in history

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

Change-Id: I5b40317cd025b5208ce88bf6b32a30d159a0fb42