Add back privacy guard manager.

Change-Id: Ic9fbbae137bb8425fe72a6cdb2f17117351b5709

Conflicts:
	proguard.flags
	res/values/cr_strings.xml