Merge changes from topic "presubmit-am-2760b8c9a44e428c950f9083fab16cff" into sc-mainline-prod am: f8f61709

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

Change-Id: Id831f17bc5906f990e93367bae15fab1dbf19fec