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

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

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

Change-Id: I0287160e0b24a8405a0513a3244d6989be740b55