Correct include_dirs in networkstack-aidl-interfaces

Even though root dir is frameworks/native/aidl/binder, its include_dir
included android/os, it caused a problem while building frozen interface
including PersistableBundle.
So correct it, and also add 'import' into aidl file.

Bug: 133526962
Test: freeze api and then m
Change-Id: Ib5583e95be32957fa2544b6f6cf4b029a05013c2
diff --git a/common/networkstackclient/Android.bp b/common/networkstackclient/Android.bp
index 7b72e72..d8bd406 100644
--- a/common/networkstackclient/Android.bp
+++ b/common/networkstackclient/Android.bp
@@ -48,7 +48,7 @@
     local_include_dir: "src",
     include_dirs: [
         "frameworks/base/core/java", // For framework parcelables.
-        "frameworks/native/aidl/binder/android/os", // For PersistableBundle.aidl
+        "frameworks/native/aidl/binder", // For PersistableBundle.aidl
         "frameworks/base/wifi/aidl-export", // For wifi parcelables.
     ],
     srcs: [
diff --git a/common/networkstackclient/src/android/net/INetworkMonitorCallbacks.aidl b/common/networkstackclient/src/android/net/INetworkMonitorCallbacks.aidl
index f57a8f7..8009a43 100644
--- a/common/networkstackclient/src/android/net/INetworkMonitorCallbacks.aidl
+++ b/common/networkstackclient/src/android/net/INetworkMonitorCallbacks.aidl
@@ -19,6 +19,7 @@
 import android.net.CaptivePortalData;
 import android.net.INetworkMonitor;
 import android.net.PrivateDnsConfigParcel;
+import android.os.PersistableBundle;
 
 /** @hide */
 oneway interface INetworkMonitorCallbacks {