[automerger skipped] Merge "Respect a Layer's (e.g. SurfaceTexture) colorSpace when compositing" into pi-dev am: 9298ad1b78
am: 439bd45a3b  -s ours

Change-Id: I8810c41637957c4d19b216ba51cd2e125f97ff88