AppOps/Privacy Guard: Fix up misaligned switches.

Change-Id: Ic9e1e09ac911e552599f7bca6fb71b2808548f1d
Merge "AppOps/Privacy Guard: Fix up misaligned switches." into cm-11.0
Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_packages_apps_Settings into cd-4.4