[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" am: 921b3f97...

[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" am: 921b3f97 am: 705336eb am: b576c751 -s ours am: 3bc806da -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie4905577d7eb8c8e583f0f7bd523b9c403d8b26c