Snap for 8917908 from c4017a193fc1fea0e652c7aa9b63ee2e9f16b5b0 to mainline-wifi-release

Change-Id: Ie3ee43a00ce2492583b717ffb2c1c66edd006842
diff --git a/apex/Android.bp b/apex/Android.bp
index bfec55c..7879611 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -121,12 +121,14 @@
     host_supported: true,
     target: {
         android: {
-            bootclasspath_fragments: ["i18n-bootclasspath-fragment"],
+            apexes: [
+                // Adds exportable dependencies of the APEX to the sdk,
+                // e.g. *classpath_fragments.
+                "com.android.i18n",
+            ],
             java_sdk_libs: [
                 "i18n.module.intra.core.api",
-                "legacy.i18n.module.platform.api",
                 "stable.i18n.module.platform.api",
-                "i18n.module.public.api",
             ],
         },
     },