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

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

Change-Id: I755143432922e81122de510f1a31c9b98ea80914