[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 61d20354 -s ours

am skip reason: Change-Id I049158ae67e9db3d2aaa409b8c32f1e764455dba with SHA-1 3220f17b is in history

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

Change-Id: I53976722b4645386e0703700799f943a4deb0acc