Settings : Add preference for proximity wake

Change-Id: I2fcbdee3bcf33f8e44b6c5fa29fb1d4d6dcab8e4
Proximity Wake-Up : adjust strings

Change-Id: I605a11b5bd7150b2a456d5c355af49fd7047e173
Settings : Make proximity opt-in

  * Fix up code to compile

Change-Id: Idfa64758a3c6d60ca4801f6f7f34f0429f95cbec
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>
Settings Cleanup and Reorganization

Change-Id: I9bd56cfb2689985c2c94273e2058c10c89d21858
Merge remote-tracking branch 'upstream/kk4.4' into kk4.4

Conflicts:
	res/values/slim_strings.xml
	res/xml/accessibility_settings.xml
	res/xml/security_settings_chooser.xml
	res/xml/security_settings_lockscreen.xml
	res/xml/security_settings_password.xml
	res/xml/security_settings_pattern.xml
	res/xml/security_settings_pin.xml
	src/com/android/settings/SecuritySettings.java
	src/com/android/settings/Settings.java
	src/com/android/settings/accessibility/AccessibilitySettings.java