AppOps/Privacy Guard: Fix up misaligned switches.

Change-Id: Ic9e1e09ac911e552599f7bca6fb71b2808548f1d
Merge "AppOps/Privacy Guard: Fix up misaligned switches." into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0