[automerger skipped] Merge "MediaFormat: new MIME types for MPEG-H audio" am:...

[automerger skipped] Merge "MediaFormat: new MIME types for MPEG-H audio" am: fae80ba7 am: 3eb382c3 am: 66989674 -s ours

am skip reason: skip tag Change-Id I6b0026e6b5b979b6c3e3ca0b1c675e890662c0df with SHA-1 bb9e2099 is already in history

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

Change-Id: I6b641981835bc6111c14c6dc992b9d1399c728e7