Merge "Revert "Store subscriber ID / IMSI into telephony database"" into qt-dev
am: 1e3ee721c7

Change-Id: I10a81bb788b6537a4c993d074a39dc34861c9f6d
diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
index e010d28..addd9e0 100644
--- a/telephony/java/android/telephony/SubscriptionManager.java
+++ b/telephony/java/android/telephony/SubscriptionManager.java
@@ -775,14 +775,6 @@
     public static final int PROFILE_CLASS_DEFAULT = PROFILE_CLASS_UNSET;
 
     /**
-     * TelephonyProvider column name IMSI (International Mobile Subscriber Identity).
-     * <P>Type: TEXT </P>
-     * @hide
-     */
-    //TODO: add @SystemApi
-    public static final String IMSI = "imsi";
-
-    /**
      * Broadcast Action: The user has changed one of the default subs related to
      * data, phone calls, or sms</p>
      *