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

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

Change-Id: I9183ea970305825757a385200bc4531db559f5a6