add colorpickerpreference
Merge branch 'psoa_r2' of https://github.com/EuclideanROM/platform_packages_apps_settings into psoa_r2