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

* commit '379aabd81e1eedcebcc24007c0274f8e6c00d211':
  Hook up HDR capabilities from native SurfaceControl

Change-Id: I3fdd51c53b0aa6edb13a77238759a272dc067c16