Merge "Moved getId API from system to public" am: ffb09e11c1 am: afefc4e426 am: f7a4c40e88 am: 8297a09b3c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640623

Change-Id: I4b2ecd419af94443eab18b105dad3333505a6366

core/api/current.txt

@@ -41987,6 +41987,7 @@ package android.telephony {
   public final class PreciseDataConnectionState implements android.os.Parcelable {
     method public int describeContents();
     method @Nullable public android.telephony.data.ApnSetting getApnSetting();
+    method public int getId();
     method public int getLastCauseCode();
     method @Nullable public android.net.LinkProperties getLinkProperties();
     method public int getNetworkType();

core/api/system-current.txt

@@ -11410,7 +11410,6 @@ package android.telephony {
     method @Deprecated public int getDataConnectionApnTypeBitMask();
     method @Deprecated public int getDataConnectionFailCause();
     method @Deprecated public int getDataConnectionState();
-    method public int getId();
   }
 
   public final class PreciseDisconnectCause {

telephony/java/android/telephony/PreciseDataConnectionState.java

@@ -166,14 +166,12 @@ public final class PreciseDataConnectionState implements Parcelable {
     /**
      * @return The unique id of the data connection
      *
-     * Note this is the id assigned in {@link DataCallResponse}.
+     * Note this is the id assigned by the data service.
      * The id remains the same for data connection handover between
      * {@link AccessNetworkConstants#TRANSPORT_TYPE_WLAN} and
      * {@link AccessNetworkConstants#TRANSPORT_TYPE_WWAN}
      *
-     * @hide
      */
-    @SystemApi
     public int getId() {
         return mId;
     }