[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: 1b825d3a -s ours

am skip reason: subject contains skip directive

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

Change-Id: Icc8f93808fc8b55012ffaa4665d4d2247662b815