Merge "Emit HDR output capabilities and HdrOutputControlSupported in...

Merge "Emit HDR output capabilities and HdrOutputControlSupported in HdrCapabilities Atom." into udc-dev am: 383de336 am: b2e80eb2

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



Change-Id: I34b3448d6c799e3fea0daae64b5486e3cf851b50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>