Revert "[2/2] OmniGears: Custom carrier label"

This reverts commit 079ec6024d376abe4838a7cbe4ac33408b22822a.

Conflicts:
	res/values/custom_strings.xml
[2/2] OmniGears: Custom carrier label

Base: https://gerrit.omnirom.org/#/c/5220/

Change-Id: If22cef7b76b346dde4e4a7520d941a378b638def

Conflicts:
	res/values/custom_strings.xml
Revert "[2/2] OmniGears: Option to enable Notification Light when screen is on"

This reverts commit 1c9ceff3fe5bb11edd635bf9ff15e646a05a1d59.

Conflicts:
	res/values/custom_strings.xml
[2/2] OmniGears: Option to enable Notification Light when screen is on

This makes it possible to let the Notification LED flash even when the screen is on

Change-Id: I3f5b8f2136a833a4c651887f3c8c97d27246863e

Conflicts:
	res/values/custom_strings.xml