Merge "DO NOT MERGE - Merge RP1A.201005.006" am: 1d5dfaac16

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

Change-Id: I0c2814666a181c154329c333d2c3c6f019de92ba