Merge "ACodec: Handle HDR10+ metadata at OutputPortSettingsChangedState" am: f7cda371b3

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

Change-Id: Iefb4175566c4f8e477ded44b7b513c05854dc55a