Add network usage stats to status bar & some additional settings cleanup (2/2)

Change-Id: I667f76cb486d67906025e1fee61a46ff4ebc1fb2

Conflicts:
	res/values/cr_arrays.xml
	res/values/cr_strings.xml
	res/xml/status_bar_settings.xml