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

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

Change-Id: Ib230afac9503c430b0019038882f307ef321d388