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