Settings : Add global proxy manager

Change-Id: I546df450fd63d14eed8c791ed4c372aac992e146

Conflicts:
	AndroidManifest.xml