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

* commit '554fa0fa90f1d7eb2b7111c7d93ab3303b4ccdd8':
  Hook up HDR capabilities from native SurfaceControl

Change-Id: Idf767a504af9c3dc1244ecb2f9b9101cfe6b907c