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

Change-Id: Ief6e7d683a39233302773a002f49df6368fb03f5

Android.bp

@@ -456,7 +456,6 @@ java_library {
     defaults: ["framework-defaults"],
     srcs: [":framework-non-updatable-sources"],
     libs: [
-        "ike-stubs",
         "framework-tethering-stubs",
     ],
     installable: true,
@@ -497,7 +496,6 @@ java_library {
         "framework-minus-apex",
         "updatable_media_stubs",
         "framework-sdkextensions-stubs-systemapi",
-        "ike-stubs",
         "framework-tethering-stubs",
     ],
     sdk_version: "core_platform",

services/core/Android.bp

@@ -54,6 +54,7 @@ java_library_static {
         "android.hidl.manager-V1.2-java",
         "dnsresolver_aidl_interface-V2-java",
         "netd_event_listener_interface-java",
+        "ike-stubs",
     ],
 }