Merge "Privacy Guard : Reimplement backed by AppOps" into cm-10.2
Conflicts:
	core/res/res/values/symbols.xml

Change-Id: I486324633a76939571c2137460081f3f81b00932