[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: 2b55e1cc1f -s ours

am skip reason: Merged-In I5036f060660256c19189e0871340c2fd3217c882 with SHA-1 cd08a64f40 is already in history

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

Change-Id: Ia8b2f43f1aa99553f407c070973f14223e0bd431