Merge "OMX Opus decoder omits sample rate / channel count" am: d5a46a87e8 am: 196a3ce602 am: 582f74d62e am: aed6389e6a

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

Change-Id: I84a21c8f3963150552fe2a3608498899a2d914d4