Merge "Add SurfaceFlinger tests for HDR Output Control." into udc-dev