Merge "media: add MediaCodec features for HLG editing and dynamic color aspects" into main am: 01d45f6961 am: a8bbf3d753

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

Change-Id: Ibdb9952d459716e2825199c06234dc9f640a6a3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>