Merge "AppOps/Privacy Guard: Fix up misaligned switches." into cm-11.0
(cherry picked from commit 4db9bc940bfaf4ef17b97ba5c8bbca17b5e44173)