Merge "MediaFormat: new MIME types for MPEG-H audio" am: fae80ba7a4 am: 3eb382c3da

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

Change-Id: I2cbfa51d8b0b4c1aaa5452064df6119b0cf8794a