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

am skip reason: Change-Id I49c82ad516931b8a7c90dc446a5df5e6ee52e56f with SHA-1 487d9e6e24 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libavc/+/12470115

Change-Id: Ic9fe56fe758ecc3af04d9d544717c68234f31153