framework-wifi: clean up AIDL exports (Attempt 2)

Remove AIDL exports to not leak internal
implementation as AIDL is not an official API
of the Wifi module.

Previous attempt broke the build.

Bug: 147757606
Change-Id: I2edeeccf83b9460881c5d4ccc6bd5d6e3befa700
Test: compiles
diff --git a/Android.bp b/Android.bp
index 1ddfbe5..06e2ed7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -306,7 +306,6 @@
             "rs/java",
             "sax/java",
             "telecomm/java",
-            "wifi/java",
         ],
     },
 
diff --git a/wifi/Android.bp b/wifi/Android.bp
index 76ccc68..2f99794 100644
--- a/wifi/Android.bp
+++ b/wifi/Android.bp
@@ -123,6 +123,8 @@
         ":framework-annotations",
         ":framework-wifi-updatable-sources",
     ],
+    // This is needed as IOnWifiActivityEnergyInfoListener.aidl in framework-wifi depends on
+    // WifiActivityEnergyInfo.aidl in framework-minus-apex
     aidl: {
         include_dirs: ["frameworks/base/core/java"],
     },
@@ -134,11 +136,6 @@
 java_library {
     name: "framework-wifi-stubs",
     srcs: [":framework-wifi-stubs-srcs"],
-    aidl: {
-        export_include_dirs: [
-            "java",
-        ],
-    },
     sdk_version: "core_current",
     libs: ["android_system_stubs_current"],
     installable: false,