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

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

Change-Id: I4fb6e5bad2295d3a51a1eb6aa8fe7a842c8c4e24