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

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

Change-Id: I1449f7148df612d64440c2f19ef55c7457b6266b