Merge changes from topic "presubmit-am-30116051431749c9827891435041f87a" into...

Merge changes from topic "presubmit-am-30116051431749c9827891435041f87a" into sc-qpr1-dev am: de735839 am: 951e0f8c am: 40f6d5f3

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

Change-Id: I63f6e0e994f0912fa6d3de1f995c53b845ff431e