Snap for 7947231 from 41bb70dd992970279f8e6a52d4dc30f67d1a17e0 to sc-v2-release

Change-Id: Ib967c2ed79fdbfd9618dd1a7ada2694598ad2b1c
diff --git a/current/Android.bp b/current/Android.bp
index e30bad5..73207dc 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -31,7 +31,7 @@
 
 prebuilt_bootclasspath_fragment {
     name: "com.android.conscrypt-bootclasspath-fragment",
-    prefer: false,
+    prefer: true,
     visibility: ["//external/conscrypt:__subpackages__"],
     apex_available: ["com.android.conscrypt"],
     licenses: ["conscrypt-module-sdk_external_conscrypt_license"],
@@ -74,7 +74,7 @@
 
 java_import {
     name: "conscrypt",
-    prefer: false,
+    prefer: true,
     visibility: [
         "//device:__subpackages__",
         "//external/conscrypt:__subpackages__",