Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_packages_apps_Settings into DJL10.2

Conflicts:
	src/com/android/settings/cyanogenmod/LockscreenTargets.java
Add active display to ChameleonOS [2/2]

PS2:
Add pocket mode option, available if the device has
a proximity sensor.

PS3:
Add option to include ongoing and non-clearable notifications.

PS4:
Allow brightness control from 0% to 100%

PS5:
Refactor for release

Change-Id: Iae55640a31df68542c2af5d95097811b8fb1f66f

Conflicts:

	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/system_ui_settings.xml
Active display: Add options for date and am/pm [2/2]

Change-Id: I6af47b2fd47e77398eee98cc6e30b8fcf1a44d45
Active display: Add sunlight mode. [2/2]

Change-Id: I513c2ef1555ca48dfb553f80ca687d1ca9f27c55
Fix some Halo dependencies in halo_settings.xml

Change-Id: Ia413b66194245d5ee6ece20dc43eba8939436df5
Merge branch 'DJL10.2' of github.com:DJL10-2/android_packages_apps_Settings into phone