Merge "CCodec: make HDR10/+ support detection logic work for encoders" am: 4e1eeb3038 am: f7a2c50ff8 am: a65b7d3172

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9b5bdf86afe8108645d96169f29aacccfcc85b17