Privacy Guard IN, App Ops OUT

Change-Id: I4edd13a2d24ac1a981bfab0683a49f93245aa099
Merge "Privacy Guard IN, App Ops OUT" into kitkat