DO NOT MERGE - Merge RP1A.201005.006 am: e2f0d892bd

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

Change-Id: Id2ba92cc2804ffd87fdf038928eadec1cd5fd347