[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: 9fb23caaa8 -s ours am: b5d192ab9c -s ours

am skip reason: Change-Id I9a88297d7202a288a4db34775f56303b5b939de4 with SHA-1 6e9849a139 is in history

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

Change-Id: Icab5b51bba15e009607e8226cee3e65ff567a90f