Frameworks: network traffic color option (1/2)

Change-Id: I94f28e12cffb46fb36d2b311319bdbd7213d4d7c

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