Merge branch 'master' into release to roll forward to cl/341113126.

cpp/platform/impl/g3/wifi_lan.cc

@@ -374,6 +374,13 @@ api::WifiLanService* WifiLanMedium::FindRemoteService(
   return env.FindWifiLanService(ip_address, port);
 }
 
+std::pair<std::string, int> WifiLanMedium::GetServiceAddress(
+    const std::string& service_id) {
+  NEARBY_LOGS(INFO) << "G3 WifiLan GetServiceAddress: service_id="
+                    << service_id;
+  return service_.GetServiceAddress();
+}
+
 }  // namespace g3
 }  // namespace nearby
 }  // namespace location

cpp/platform/impl/g3/wifi_lan.h

@@ -232,6 +232,9 @@ class WifiLanMedium : public api::WifiLanMedium {
   api::WifiLanService* FindRemoteService(const std::string& ip_address,
                                          int port) override;
 
+  std::pair<std::string, int> GetServiceAddress(
+      const std::string& service_id) override ABSL_LOCKS_EXCLUDED(mutex_);
+
  private:
   static constexpr int kMaxConcurrentAcceptLoops = 5;