Merge changes from topic "presubmit-am-88c247f63a5a4f09894fc4d419bd6d9a" into sc-mainline-prod am: b90aeac3ac

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

Change-Id: I4e77db9d1594f16e9ca90486dde339a550246067