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

Change-Id: Icb1eecc90df3128f745c81f883fafaf676e02215