Merge changes from topic "presubmit-am-2760b8c9a44e428c950f9083fab16cff" into...

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

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

Change-Id: If470b864e1c2a2c608eb11da3447179c78699045