[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: b70940fbdd -s ours

am skip reason: Merged-In Icace1828cffaecd45db52671b844fc04e597bc48 with SHA-1 650210f37c is already in history

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

Change-Id: I074970db88c333fc0ef2cf3df44ad7e5dc98e08c