Merge "Revert "Update path for BasicShellCommandHandler""
diff --git a/Android.bp b/Android.bp
index e7ca068..1887a8a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -35,7 +35,6 @@
         "com.android.phone.common-lib",
         "guava",
         "PlatformProperties",
-        "modules-utils-os",
     ],
 
     srcs: [
diff --git a/src/com/android/phone/TelephonyShellCommand.java b/src/com/android/phone/TelephonyShellCommand.java
index c6a2f52..c3f2974 100644
--- a/src/com/android/phone/TelephonyShellCommand.java
+++ b/src/com/android/phone/TelephonyShellCommand.java
@@ -17,6 +17,7 @@
 package com.android.phone;
 
 import android.content.Context;
+import android.os.BasicShellCommandHandler;
 import android.os.Binder;
 import android.os.PersistableBundle;
 import android.os.Process;
@@ -33,7 +34,6 @@
 import com.android.internal.telephony.PhoneFactory;
 import com.android.internal.telephony.emergency.EmergencyNumberTracker;
 import com.android.internal.telephony.util.TelephonyUtils;
-import com.android.modules.utils.BasicShellCommandHandler;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;