Merge branch android10-qpr2-release

Change-Id: Ie71f09c3328efd4ba80caa719aa9e0617ab49234
diff --git a/Android.bp b/Android.bp
index e4df2f3..1418e01 100644
--- a/Android.bp
+++ b/Android.bp
@@ -238,6 +238,8 @@
         "android.net.ssl",
         "com.android.org.conscrypt",
     ],
+
+    plugins: ["java_api_finder"],
 }
 
 // A guaranteed unstripped version of conscrypt.