[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am:...

[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 51b68428 -s ours am: 3e46f093 -s ours

am skip reason: Merged-In I87e9fc4fd54e138b6c678e3d6d580a8e961733b9 with SHA-1 41b06060 is already in history

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

Change-Id: I021c10b135e7b3fbbeec57188ddab6968285ee77