Merge "Hook up HDR capabilities from native SurfaceControl" into nyc-dev am: 554fa0f am: 18120cd
am: 6b35f57

* commit '6b35f571af17ea4176b812a53ec5069347491887':
  Hook up HDR capabilities from native SurfaceControl

Change-Id: Ia283c09c14f4cdbc4b59b7dbcc5df8bc1116eaf0