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

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

Change-Id: I96a376ea75ce1f11a9112c89d0cb0406b1ee70e9