Profiles: fix expanded desktop settings not applying

Change-Id: Ia523145bf47bfc189c29b035ad5ec6e053cf9296
Settings: Improve some strings

 * Apply https://github.com/CyanogenMod/android_packages_apps_Settings/commit/6de9905cfc5dfc85e8c08f29f87f01a0cc13ef48
 * Use multiplication symbol for lock_pattern_size_*
 * Capitalise "Kernel Samepage Merging"
 * Rename various Quick Setting tiles to better match how the features are described elsewhere
 * Shorten dynamic tiles string
 * Change a couple of profile options
 * Capitalise Wi-Fi and Bluetooth in App Ops

Change-Id: I6a89c3d8017b66ede80d3b567374133733bb8168
Settings: Fix "Use actual storage type of sdcard/usb (1/2)."

Fixes http://review.cyanogenmod.org/63744

The original patch used the same string ids for sd in both cm_strings.xml and strings.xml.
Change them so there isn't a clash causing the wrong strings to be displayed by always prefixing the aosp ids with either sd_ or usb_.

Change-Id: Iad509123a9b4b93677b6ec06f15c34d9b0f57165
Merge pull request #24 from CyanogenMod/cm-11.0

Update to upstream