Merge changes from topic "presubmit-am-3dedf333562940f1a933c99cb991bb87" into sc-dev-plus-aosp am: b153c6fe am: 1a5d9948

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

Change-Id: I509cd5c823a609b251355199d208a08513240656