OmniSwitch: service life-cycle tweaks

Service must no be killed

Conflicts:
	AndroidManifest.xml

Change-Id: I2efc7776822ffe81cf9d71a8141360d9c5aa27c8