Statusbar Network Indicator custom colors (2/2)
    - Reset button to stock color working

Change-Id: If894da212abbe6c4b8775e9c6029bf89f330e7d6

Conflicts:
	AndroidManifest.xml
	res/values-de/ck_strings.xml
	res/values/ck_strings.xml
	res/xml/status_bar.xml