Merge "MediaCodec: Add HDR metrics." am: 46bfebee44 am: 0c2cf568bc am: 0750b6ff16

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1956540

Change-Id: Ifc54b3a65709d1684af341bc5ab860bab83c6667