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

[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 5da3a2ca -s ours am: 604bd2fc -s ours am: 18f0f995 -s ours

am skip reason: Merged-In I591c1a3955f70926d5e814b5c0e088706658d174 with SHA-1 c577daab is already in history

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

Change-Id: Ib0d143df1d921a754b0c735a7948610c3f19872b