[automerger skipped] Merge "DO NOT MERGE - Merge RP1A.201005.006" am:...

[automerger skipped] Merge "DO NOT MERGE - Merge RP1A.201005.006" am: 1d5dfaac am: aebdaca9 -s ours am: d99cbc1f -s ours am: 80db6475 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1cdf7a9880001ad7616d44fb23e4564d1135ad3b