[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: e6144b61 am:...

[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: e6144b61 am: 5fd752c0 -s ours am: af80847d -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ifad0ca7d1c9cdd554cabaa158befc6b2b28826de