[automerger skipped] DO NOT MERGE - Merge RP1A.201005.006 am: e2f0d892bd am: 62c68e9267 -s ours am: 5b5abf445c -s ours

am skip reason: Change-Id I1f62fdc077401fea2c48a31527464464f08a6b64 with SHA-1 1d595f80e9 is in history

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

Change-Id: I53ed20b129d8cb7ce2c8cb4e479288df851245eb