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

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

Change-Id: Idf7a7f8cbd0fdca76e0e37a5507939e308d949fa