[automerger skipped] Merge "[SurfaceFlinger] Add methods for setting legacy starution matrix." into pi-dev am: 7c964b3d79
am: be73cb4257  -s ours

Change-Id: I0e44cab1f3890c8525a2aadc0b884993df425970