[automerger skipped] Merge "[SurfaceFlinger] Respect HDR data space." into pi-dev am: 3e27306538
am: dc0fe0d833  -s ours

Change-Id: Ia8cc5771638bdb00a6afe05e163b9be3a45043e7