recovery: go back to standard adb root prop

 * This reverts change Ib0d5c38faabe0cc5b42c0f2ec51bac936715260f
   plus more

Change-Id: I7b6c62a448e81464d7d732176d249d4bf7d84460
diff --git a/etc/init.rc b/etc/init.rc
index a870b7c..2b89cc0 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -114,7 +114,7 @@
     seclabel u:r:fastbootd:s0
 
 # Restart adbd so it can run as root
-on property:sys.usb.config=adb && property:lineage.service.adb.root=1
+on property:sys.usb.config=adb && property:service.adb.root=1
     restart adbd
 
 on fs && property:sys.usb.configfs=1
diff --git a/recovery_main.cpp b/recovery_main.cpp
index a0ee7c4..2749c35 100644
--- a/recovery_main.cpp
+++ b/recovery_main.cpp
@@ -490,7 +490,7 @@
   // Set up adb_keys and enable root before starting ADB.
   if (is_ro_debuggable() && !fastboot) {
     copy_userdata_files();
-    android::base::SetProperty("lineage.service.adb.root", "1");
+    android::base::SetProperty("service.adb.root", "1");
   }
 
   while (true) {