Merge "Move adbd stopped trigger for configfs into core."
am: e21b2fb6b4

Change-Id: I3b1162d5467fa3443849889564ae3e92bdbea4eb
diff --git a/rootdir/init.usb.configfs.rc b/rootdir/init.usb.configfs.rc
index a64b506..de1aab3 100644
--- a/rootdir/init.usb.configfs.rc
+++ b/rootdir/init.usb.configfs.rc
@@ -12,6 +12,9 @@
     rmdir /config/usb_gadget/g1/functions/rndis.gs4
     setprop sys.usb.state ${sys.usb.config}
 
+on property:init.svc.adbd=stopped
+    setprop sys.usb.ffs.ready 0
+
 on property:sys.usb.config=adb && property:sys.usb.configfs=1
     start adbd