Merge changes from topic "presubmit-am-480b2eda365e4542b35567d1a83bb769" into sc-mainline-prod am: ea0e690192

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

Change-Id: I5cab85acad546aaa22b58a81572b207dd27d4b68