[2/2] Base: Upgrade network traffic meter

Change-Id: I0fe94646eaa8e229c302e27eec33915d730da785
fix network traffic meter menu

Change-Id: Ic36895b138f5dcc82dd2d36b803af9e9f10e07b4
automatic translation import

Change-Id: I93ed190ff87104f84d7aaf751df79a0782c69769
Merge remote-tracking branch 'upstream/android-4.4' into android-4.4

Solved conflicts:
	res/values/custom_arrays.xml
	src/com/android/settings/cyanogenmod/StatusBar.java