Merge "Remove PARENT_SUB_ID since it's no longer needed."

am: 4dd4cf5679

Change-Id: If9a0a94377d5ba328413eea2467bef97eae3d8f9

telephony/java/android/telephony/SubscriptionManager.java

@@ -567,13 +567,7 @@ public class SubscriptionManager {
      * @hide
      */
     public static final String IS_OPPORTUNISTIC = "is_opportunistic";
-    /**
-     * TelephonyProvider column name for subId of parent subscription of an opportunistic
-     * subscription.
-     * if the parent sub id is valid, then is_opportunistic should always to true.
-     * @hide
-     */
-    public static final String PARENT_SUB_ID = "parent_sub_id";
+
     /**
      * TelephonyProvider column name for group ID. Subscriptions with same group ID
      * are considered bundled together, and should behave as a single subscription at
@@ -582,12 +576,14 @@ public class SubscriptionManager {
      * @hide
      */
     public static final String GROUP_UUID = "group_uuid";
+
     /**
      * TelephonyProvider column name for whether a subscription is metered or not, that is, whether
      * the network it connects to charges for subscription or not. For example, paid CBRS or unpaid.
      * @hide
      */
     public static final String IS_METERED = "is_metered";
+
     /**
      * Broadcast Action: The user has changed one of the default subs related to
      * data, phone calls, or sms</p>