Revert "Privacy Guard(2/2)"

This reverts commit d2fcc5b4deb3e4e94086e78b76a7f75ee78aba54.

Change-Id: Ic54742ee4ecce66038027f8c4c41fe801de77c35
Merge "Revert "Privacy Guard(2/2)"" into android-4.4