Merge "Add constant values for MPEG-H." am: 6286d0952d am: 315d8a0faf

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

Change-Id: I065363f18a7fc389add1518213596bd930d562df