[automerger skipped] Fix bugs in OPUS codec wrappers. am: ad79bbc7 am: cf61fd6d -s ours

am skip reason: Merged-In I7811e36170ff51d1e9863f2225816e5488e09054 with SHA-1 4af9bd9e is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2431377



Change-Id: Ic6b9626e74c5c1ac7c083f426908d5f712cbfc13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>