Statusbar Network Indicator custom colors (2/2)

- Reset button to stock color working

Change-Id: I11737ae68aba59c6cf2ee239acd297c103bd46d1

Conflicts:

	AndroidManifest.xml
	res/values/cm_strings.xml
	res/xml/status_bar.xml

Conflicts:

	AndroidManifest.xml