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

am skip reason: Change-Id I85473f8be0942c0636097038cd447aed2b4c6dc1 with SHA-1 2cb33c8acd is in history

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

Change-Id: I382f8f3df135d3d7651fdc1d1a49701b022e9530