Merge changes from topic "presubmit-am-fb1de9e365894aa2afdcbd063530de50" into...

Merge changes from topic "presubmit-am-fb1de9e365894aa2afdcbd063530de50" into sc-qpr1-dev am: 43680ba2 am: 9f726df0 am: ee7e0507

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

Change-Id: If05878a5b74918e7f794b024900a353c3d76d94c