[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 skip reason: Change-Id I1f62fdc077401fea2c48a31527464464f08a6b64 with SHA-1 1d595f80 is in history

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

Change-Id: Ic170e7a3a6dd6c9513aa3268cdc3d70042ffaa2c