Revert "Convert Controller to a full service"

This reverts commit 0e6d972641c19467d6b26351ce14a3f44c9fd6f4.

Change-Id: I005fc34152396806468edef919a3620961ddb4fe
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 47afa28..305e36a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -277,10 +277,9 @@
             >
         </service>
 
-        <!-- Controller runs at all times -->
-         --><service
+        <service
             android:name=".Controller"
-            android:enabled="true"
+            android:enabled="false"
             >
         </service>