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

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

Change-Id: Ibd8ea777e76acb2577ed61b120efe5075b1928b3