Merge "DisplaySettings: Add hardware-framework support for color enhancement" into cm-11.0
(cherry picked from commit 6c7a2871d098f123e6ede381c851af88f1eb5b35)