Merge "Move libicing.so out of /usr/lib, into the appsearch apex." into sc-dev am: 5a26c6b39c am: d5add214c1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15003778

Change-Id: I18dc924bde66b38b790bdc62bd791521191287b1

apex/appsearch/Android.bp

@@ -29,6 +29,7 @@ apex {
     key: "com.android.appsearch.key",
     certificate: ":com.android.appsearch.certificate",
     updatable: false,
+    jni_libs: ["libicing"],
     generate_hashtree: false,
 }
 

apex/appsearch/service/Android.bp

@@ -53,9 +53,6 @@ java_library {
         "framework-appsearch.impl",
         "unsupportedappusage", // TODO(b/181887768) should be removed
     ],
-    required: [
-        "libicing",
-    ],
     defaults: ["framework-system-server-module-defaults"],
     permitted_packages: [
         "com.android.server.appsearch",