Merge "codec2: fix HEVC HDR profile conversion" am: f06b8761c6 am: 7eb14e0f2c

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

Change-Id: I49ee6ad542584566b4ace85081cccb267fb6545a