DO NOT MERGE - Merge ab/7272582 am: e6144b61c9

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

Change-Id: If23cf61ff2f50e50a1a067a6164e9b49b41b14cf