Merge "MediaFormat: Update constants for MPEG-H codecs" am: ca57ecee1b am: 3d46fe5294

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1680925

Change-Id: Ia10684622673a6a9875aebc85667be794a958d0a