Merge changes from topic "presubmit-am-88c247f63a5a4f09894fc4d419bd6d9a" into...

Merge changes from topic "presubmit-am-88c247f63a5a4f09894fc4d419bd6d9a" into sc-dev-plus-aosp am: 8627b487 am: ae31a5e4 am: 96232368

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

Change-Id: I040a8341b334cbc0b2ec0f635c2f7600cafb3b0a