Merge RP1A.200423.002

Change-Id: I8fa9cc51525229ddc25ce8e74780e89a55c1f42d
diff --git a/Android.bp b/Android.bp
index 5c52121..b809a9f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,9 +41,8 @@
     host_supported: true,
     recovery_available: true,
     apex_available: [
-        "com.android.neuralnetworks",
-        "test_com.android.neuralnetworks",
         "//apex_available:platform",
+        "//apex_available:anyapex",
     ],
     native_bridge_supported: true,
 }