Merge "DO NOT MERGE - Merge ab/7272582" am: 921b3f97d4

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

Change-Id: I65f05fd54a28a550e9ace22d694502df479471dc