Settings: network traffic color option (2/2)

Conflicts:
	src/com/android/settings/liquid/NetworkTraffic.java

Change-Id: I1033dab2f752ffa75a2c885e2d715d88bab25fd2