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

Change-Id: I3e1c8264a326f4ef0e8fca9902e574b2c6a8fbc4