Merge "[Mainline] decouple TelephonyProvider from hidden ServiceState dependencies."
diff --git a/OWNERS b/OWNERS
index bce6270..b3aa980 100644
--- a/OWNERS
+++ b/OWNERS
@@ -11,3 +11,4 @@
breadley@google.com
nazaninb@google.com
sarahchin@google.com
+dbright@google.com
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index e8f26fd..1472156 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -114,8 +114,6 @@
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.internal.telephony.PhoneConstants;
-import com.android.internal.telephony.uicc.UiccController;
import com.android.internal.util.XmlUtils;
import android.service.carrier.IApnSourceService;