Snap for 9705326 from 71eb4b5242957e89bb6f53f268c2d30fd83b575d to udc-release

Change-Id: I2da570a074009260924db6f98d68fa7bc0a50e79
diff --git a/java/com/android/libraries/entitlement/ServiceEntitlement.java b/java/com/android/libraries/entitlement/ServiceEntitlement.java
index e050cd3..c0d6d55 100644
--- a/java/com/android/libraries/entitlement/ServiceEntitlement.java
+++ b/java/com/android/libraries/entitlement/ServiceEntitlement.java
@@ -53,9 +53,9 @@
      */
     public static final String APP_ODSA_PRIMARY = "ap2009";
     /**
-     * App ID for premium network slice entitlement
+     * App ID for data plan information entitlement.
      */
-    public static final String APP_PREMIUM_NETWORK_SLICE = "ap2012";
+    public static final String APP_DATA_PLAN_BOOST = "ap2010";
 
     private final CarrierConfig carrierConfig;
     private final EapAkaApi eapAkaApi;
diff --git a/java/com/android/libraries/entitlement/ServiceEntitlementRequest.java b/java/com/android/libraries/entitlement/ServiceEntitlementRequest.java
index 59e70ef..e0ecbf7 100644
--- a/java/com/android/libraries/entitlement/ServiceEntitlementRequest.java
+++ b/java/com/android/libraries/entitlement/ServiceEntitlementRequest.java
@@ -123,10 +123,9 @@
     public abstract String acceptContentType();
 
     /**
-     * Returns the network identifier for premium network. Used for premium network slice
-     * entitlement.
+     * Returns the boost type for premium network. Used for premium network slice entitlement.
      */
-    public abstract String networkIdentifier();
+    public abstract String boostType();
 
     /**
      * Returns a new {@link Builder} object.
@@ -146,7 +145,7 @@
                 .setNotificationToken("")
                 .setNotificationAction(NOTICATION_ACTION_ENABLE_FCM)
                 .setAcceptContentType(ACCEPT_CONTENT_TYPE_JSON_AND_XML)
-                .setNetworkIdentifier("");
+                .setBoostType("");
     }
 
     /**
@@ -264,12 +263,12 @@
         public abstract Builder setAcceptContentType(String contentType);
 
         /**
-         * Sets the network identifier for premium network. Used by HTTP parameter
-         * "network_identifier" in case of premium network slice entitlement.
+         * Sets the boost type for premium network. Used by HTTP parameter
+         * "boost_type" in case of premium network slice entitlement.
          *
          * <p>Optional.
          */
-        public abstract Builder setNetworkIdentifier(String value);
+        public abstract Builder setBoostType(String value);
 
         public abstract ServiceEntitlementRequest build();
     }
diff --git a/java/com/android/libraries/entitlement/eapaka/EapAkaApi.java b/java/com/android/libraries/entitlement/eapaka/EapAkaApi.java
index dc3c518..be41ca7 100644
--- a/java/com/android/libraries/entitlement/eapaka/EapAkaApi.java
+++ b/java/com/android/libraries/entitlement/eapaka/EapAkaApi.java
@@ -91,7 +91,7 @@
     private static final String OLD_TERMINAL_ID = "old_terminal_id";
     private static final String OLD_TERMINAL_ICCID = "old_terminal_iccid";
 
-    private static final String NETWORK_IDENTIFIER = "network_identifier";
+    private static final String BOOST_TYPE = "boost_type";
 
     // In case of EAP-AKA synchronization failure or another challenge, we try to authenticate for
     // at most three times.
@@ -362,7 +362,7 @@
         // Optional query parameters, append them if not empty
         appendOptionalQueryParameter(urlBuilder, APP_VERSION, request.appVersion());
         appendOptionalQueryParameter(urlBuilder, APP_NAME, request.appName());
-        appendOptionalQueryParameter(urlBuilder, NETWORK_IDENTIFIER, request.networkIdentifier());
+        appendOptionalQueryParameter(urlBuilder, BOOST_TYPE, request.boostType());
 
         for (String appId : appIds) {
             urlBuilder.appendQueryParameter(APP, appId);