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

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

Change-Id: I3de27c0b33edb87d825db662dab55173c01eaf4c