Merge "Properly applies the selected saturation boost (vivid mode)" into oc-dr1-dev am: 3eba4064ef am: 732ee9e17f am: 9af229146d
am: 9302f255ea

Change-Id: Ic9f6a96787746720c4edbe48fb310aa85b275a1d