FWB: Network traffic supercharged (1/2)

Bring back AICP kk traffic

Change-Id: Ide3ac899da7632dd1fb3a0615ab9560a4ae6cfd0

Conflicts:
	core/java/android/provider/Settings.java