Merge "C2SoftOpusEnc: CleanUp output allocations for opus encoder" into main am: 005302b9e6

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3038974

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