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

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

Change-Id: I34316e344511685ce58623ffee4c7bbfdbbfa09e