[automerger skipped] Add conscrypt to PRODUCT_UPDATABLE_BOOT_JARS. am: 2a6f1ed29a -s ours

am skip reason: Change-Id I9c03715b0658529b4df66a5d7f1aefc28d210476 with SHA-1 af3ae258ba is in history

Change-Id: Idbdee5a82edaa841008c819c84facd4f2d5ae300
diff --git a/qemu_base.mk b/qemu_base.mk
index 2a62a8d..5657336 100644
--- a/qemu_base.mk
+++ b/qemu_base.mk
@@ -37,7 +37,7 @@
 
 # Device modules
 PRODUCT_PACKAGES += \
-    adbd \
+    adbd.com.android.adbd \
     bootanimation \
     debuggerd \
     debuggerd64 \