Merge "add aconfigd-system binary and libaconfigd_system library to generic system image" into main am: a452c2977b am: f58fa0ba4b

Original change: https://android-review.googlesource.com/c/platform/build/+/3333715

Change-Id: I05e0a513a0b472bf24fe3a54cffa800fe2222d2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/target/product/generic/Android.bp b/target/product/generic/Android.bp
index 0cd2959..76eba40 100644
--- a/target/product/generic/Android.bp
+++ b/target/product/generic/Android.bp
@@ -379,6 +379,7 @@
     deps: [
         "abx",
         "aconfigd",
+        "aconfigd-system",
         "aflags",
         "am",
         "android.software.credentials.prebuilt.xml", // generic_system