[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: 749b5d5edc -s ours

am skip reason: Merged-In I4da2840844d60f251dd7a222f51d508e4eb8749f with SHA-1 a6a69736ba is already in history

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

Change-Id: Icc2142cf56e9dbc44641be5813362c5a70cd3c1f