Merge branch android10-qpr2-release

Change-Id: I38d6ddce47b8e8f1779ce364d463c453e0ffe1a2
diff --git a/Android.bp b/Android.bp
index c013b8c..1e583e1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -49,6 +49,7 @@
         "captiveportal-lib",
     ],
     manifest: "AndroidManifestBase.xml",
+    plugins: ["java_api_finder"],
 }
 
 cc_library_shared {