Merge changes from topic "presubmit-am-480b2eda365e4542b35567d1a83bb769" into...

Merge changes from topic "presubmit-am-480b2eda365e4542b35567d1a83bb769" into sc-qpr1-dev am: 56ecb513 am: 0191ab1f

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

Change-Id: I668c034638d2b2e3494fa294e07130e14f2e3b8f