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

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

Change-Id: I68b1d8518691cb7858a29de7675384d3792e1b1a