Merge changes Iadfd290c,Ib9d5173a into main

* changes:
  Implement the remaining USD methods in the mainline supplicant.
  Implement getUsdCapabilities, cancelUsdPublish, and cancelUsdSubscribe in the mainline supplicant.
diff --git a/wpa_supplicant/aidl/mainline/mainline_supplicant.cpp b/wpa_supplicant/aidl/mainline/mainline_supplicant.cpp
index b1a873d..09021fe 100644
--- a/wpa_supplicant/aidl/mainline/mainline_supplicant.cpp
+++ b/wpa_supplicant/aidl/mainline/mainline_supplicant.cpp
@@ -52,7 +52,7 @@
     std::shared_ptr<IStaInterface> staIface =
         ndk::SharedRefBase::make<StaIface>(wpa_global_, ifaceName);
     active_sta_ifaces_[ifaceName] = staIface;
-    _aidl_return = &staIface;
+    *_aidl_return = staIface;
 
     wpa_printf(MSG_INFO, "Interface %s was added successfully", ifaceName.c_str());
     return ndk::ScopedAStatus::ok();