Merge "Revert "framework: Privacy Guard"" into cm-10.2
Conflicts:
	core/res/res/values/symbols.xml

Change-Id: I6711cf5c99de47f93315dd6e9283f85c51e8a0b5