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

Change-Id: Id290dd836752e01b9aac397ca5048cd90e15c395