Merge "Merge "Hook up HDR capabilities from native SurfaceControl" into nyc-dev am: 554fa0f am: 379aabd" into nyc-mr1-dev-plus-aosp
am: d306436

* commit 'd306436ece7eb95e8357a5412e16a6a5ba07f024':

Change-Id: Ib6c511fb5e44226bce60da3bfda35f323902becb