Add Advanced Device Specific Settings (CM)

Change-Id: I295cd4959e106b1fb105d1f08c29f21eb51844e2
Merge branch 'jellybean' of github.com:ParanoidAndroid/android_packages_apps_Settings into HEAD
Revert derp-merge

Change-Id: I30552985f6aa8ed8c1a367cbf6a8012237b405b0