Merge "Properly applies the selected saturation boost (vivid mode)" into oc-dr1-dev am: 3eba4064ef am: 3770426bc4 am: 61d2767501 am: 5c1ce22396
am: 56ddc06f1b

Change-Id: If6836ff63734b61ad9c46d4d8e8c14b8e72dc577