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

Change-Id: I41cc35ca14bb6362b1d5029677cbf3dcba1a778f