[automerger skipped] Merge Android R...

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 61d20354 -s ours am: 046c1fcc -s ours am: 8d2cf0cc -s ours am: ae5eaa64 -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: I419f9f3d73d667b2b6438a8eb2a3f456eb736282