[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am:...

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

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

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

Change-Id: Id08dd76d895bf103c23199fe8432f9d80aacab1b