Settings: Add proximity wake option

Ports and combines:

http://review.cyanogenmod.org/#/c/66658/
Settings : Add preference for proximity wake

http://review.cyanogenmod.org/#/c/69347/
Proximity Wake-Up : adjust strings

http://review.cyanogenmod.org/#/c/69803/
Settings : Make proximity opt-in

Change-Id: Iea0853eccf764438c7aaac76afd13c364fcea0ec
(cherry picked from commit 7241e89c8611bddf3de19b9f4c02eb969444e1e7)

Conflicts:
	src/com/android/settings/DisplaySettings.java
Settings: Port "Development shortcut" (1/2)

New setting under "Debug settings" that enables the development shortcut
Change-Id: I9a43e611911f2e278605715f714860ad11236fd9

Modify the Development shortcut help text
Change-Id: Iaa6d87f5044a46e8c0f8d88a4fc9bf9a494188b8

Change-Id: I9a43e611911f2e278605715f714860ad11236fd9
(cherry picked from commit 2b1a660a172b182d387c8d0b4e6ea3d7baf5b1d0)

Conflicts:
	res/xml/development_prefs.xml
	src/com/android/settings/DevelopmentSettings.java
Settings: Fix no preferred APN

Add preferred APN if found no match.

CRs-Fixed: 748830

Change-Id: Ibecf88a3e6236de13a0a4291438a6e62159a05e0

(cherry picked from commit 308c89f3b7048e0d13b472f4ef5b8ae7dcd464ad)
packages: settings: CryptKeeper: Disable FDE if PFE activated

Don't allow Full-Disk-Encryption (FDE) after Per-File-Encryption (PFE)

Change-Id: I5ed46d4362f6536a6cf526aa5bf4bac4610c47b6

(cherry picked from commit 1d523acd54679269bf50be19f5321aeea7a6e798)
Remove activity tags with fragments from Manifest

Change-Id: I95118ebe7b876cf29ee0bfdfe876ebd839619b89

(cherry picked from commit b59e4b300012341b8632ede12c5961b650714450)