Merge "Add sysprop to control HDR headroom" into udc-dev am: 954c3d6d3e am: 008dc4a408

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22087306

Change-Id: Ib11412242ecb2af89520045b2559899746f30460
Signed-off-by: Automerger Merge Worker <[email protected]>