Merge changes from topic "presubmit-am-480b2eda365e4542b35567d1a83bb769" into sc-qpr1-dev am: 56ecb51338 am: d92e74bd56 am: 30ae51527b

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

Change-Id: I19e543eb9b5445115961eb054d698a30ae923f1f