Revert "Combine privacy guard and AppOps to use it kinda like Permission management"

This reverts commit d9b5170863c328924675545566bd1f96b575738f.

Change-Id: Ibae154a234b4e761d57fd2bf225fd355b68f8978