[automerger skipped] Merge "Add constant values for MPEG-H." am: 6286d095...

[automerger skipped] Merge "Add constant values for MPEG-H." am: 6286d095 am: 315d8a0f am: 26b0f320 -s ours am: fac4949f -s ours

am skip reason: skip tag Change-Id Iea5432765abeb485a31c8848793dffce1d4c6a0b with SHA-1 f836836b is already in history

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

Change-Id: I6506cf15946b11f72cf500d233193da4702f9a7b