Revert "Fix for default USB debugging in eng builds.  Starts adbd on first launch and accepts all connections for eng, starts adbd on first launch and prompts for userdebug, does not start adbd for user."

This reverts commit df662965b33cac772ed5457e726067f49606d3c5.

Change-Id: I0d79ab490ba39a806c065ad945c8dea5904d6229