Traffic support (2/2)

Change-Id: I2bf7315bd965b8286bb1425f34b962568038c0a7

Conflicts:
	res/values-zh-rCN/pa_strings.xml
	res/values/pa_strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java