Add LockClock to Settings menu

Change-Id: Ie9d10e7c8186354f01e29e1aaeb23b580ebd04aa
Add back privacy guard manager.

Change-Id: Ic9fbbae137bb8425fe72a6cdb2f17117351b5709

Conflicts:

	AndroidManifest.xml
	proguard.flags
AppOps: Add advanced menu link from privacyguard

Forward port from cm-10.2

Change-Id: I09b06eca34366526e5b1cd39763f31414e93a0c0
[2/3] Settings: Remove Active display

Change-Id: I0f2960249fbad02fdab437a59fd84a8b6bf3c86b

Conflicts:

	res/drawable-hdpi/ic_settings_actived.png
	res/drawable-mdpi/ic_settings_actived.png
	res/drawable-xhdpi/ic_settings_actived.png
	res/drawable-xxhdpi/ic_settings_actived.png
	res/xml/settings_headers.xml

Conflicts:

	res/xml/settings_headers.xml