[2/2] Allow Mobile Indicator to be toggled off when connected to WiFi

Conflicts:
	res/values/strings.xml

Change-Id: Ifc91d7e9532178274d3e25ae740d4cf36564b030