[automerger skipped] Merge "Add constant values for MPEG-H." am: 6286d0952d am: 315d8a0faf am: 26b0f32060 -s ours
am skip reason: skip tag Change-Id Iea5432765abeb485a31c8848793dffce1d4c6a0b with SHA-1 f836836b3d is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1670526
Change-Id: I260cfb2087709036326713ca87da4976b19b08ce
This commit is contained in: