Revert "Settings: Add default value for display color control (2/2)"

This reverts commit 17b9d0bee7f7a8f99541d8f9b1e898b72d459938.
remove lock screen inside tta settings
remove lock screen inside triangles settings
Merge branch 'cm-11.0' of https://github.com/Triangles/android_packages_apps_Settings into cm-11.0