Merge "[SurfaceFlinger] Extend HDR support." into pi-dev
am: 88428cd0af

Change-Id: I6c622d36e0d509cf060ce9797ae3b00e8b0cc7d3