Merge "Dynamically include ike-stubs in services.core.unboosted"

Android.bp

@@ -474,7 +474,6 @@ java_library {
         "framework-statsd-stubs-module_libs_api",
         "framework-permission-stubs-systemapi",
         "framework-wifi-stubs",
-        "ike-stubs",
         "framework-tethering-stubs",
     ],
     installable: true,
@@ -525,7 +524,6 @@ java_library {
         "framework-sdkextensions-stubs-systemapi",
         "framework-statsd-stubs-module_libs_api",
         "framework-wifi-stubs",
-        "ike-stubs",
         "framework-tethering-stubs",
         // TODO (b/147688669) should be framework-telephony-stubs
         "framework-telephony",

services/core/Android.bp

@@ -126,6 +126,7 @@ java_library_static {
         "android.hidl.manager-V1.2-java",
         "dnsresolver_aidl_interface-V2-java",
         "netd_event_listener_interface-java",
+        "ike-stubs",
     ],
 
     plugins: [