Merge changes from topic "presubmit-am-5993d312431048f889846ac42d0e78fc" into sc-dev-plus-aosp am: edc9f945 am: 362da028

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

Change-Id: Ieb971b0da257315d9ed8288a4f4bb418fb192902