Merge changes I16f94ee3,I071fdb62 into main

* changes:
  Fixed eSIM activation failed issue
  Fixed incorrect phone number from inactive subscription
diff --git a/Android.bp b/Android.bp
index fab53d1..c636ade 100644
--- a/Android.bp
+++ b/Android.bp
@@ -109,13 +109,6 @@
         "modules-utils-statemachine",
     ],
 
-    product_variables: {
-        pdk: {
-            // enable this build only when platform library is available
-            enabled: false,
-        },
-    },
-
     optimize: {
         enabled: true,
         shrink: true,