display: Make advanced settings a category

This was a separate screen but it's too empty for that, let's make
it a category like in CM11 for now. If it ever becomes a separate
screen it needs its own fragment so that navigation is possible
via actionbar.

Change-Id: I4b1f3e78a013412d5e39847683ca622dc76b9fa1
Port: Wake on plug (2/2)

Change-Id: Icdacf8b186d893c2a107d9d61aa5439d777f4523
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
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
Settings: Fix no preferred APN

Add preferred APN if found no match.

CRs-Fixed: 748830

Change-Id: Ibecf88a3e6236de13a0a4291438a6e62159a05e0
packages: settings: CryptKeeper: Disable FDE if PFE activated

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

Change-Id: I5ed46d4362f6536a6cf526aa5bf4bac4610c47b6
Remove activity tags with fragments from Manifest

Change-Id: I95118ebe7b876cf29ee0bfdfe876ebd839619b89
Merge pull request #2 from CyanogenMod/cm-12.0

new patch from cm12