Merge changes from topic "presubmit-am-96a1f55501ab40b896d6744adf33b55e" into...

Merge changes from topic "presubmit-am-96a1f55501ab40b896d6744adf33b55e" into sc-qpr1-dev am: 4161d851 am: 1a40ba25 am: 9f9e4767

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

Change-Id: If4885d657ced3d3456bbb085375b38938bee0426