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

cpp/core/internal/mediums/webrtc.h

@@ -100,6 +100,11 @@ class WebRtc {
     kAnswerer = 2,
   };
 
+  absl::flat_hash_map<Role, std::string> role_names_{
+      {Role::kNone, "None"},
+      {Role::kOfferer, "Offerer"},
+      {Role::kAnswerer, "Answerer"}};
+
   struct ConnectionInfo {
     std::unique_ptr<ConnectionFlow> connection_flow;
     std::unique_ptr<WebRtcSignalingMessenger> signaling_messenger;
@@ -111,6 +116,7 @@ class WebRtc {
     ByteArray pending_local_offer;
     std::vector<::location::nearby::mediums::IceCandidate>
         pending_local_ice_candidates;
+    std::string ToString() const;
   };
 
   bool InitWebRtcFlow(const Role& role, const PeerId& self_id,
@@ -210,6 +216,8 @@ class WebRtc {
                                     const std::string& connection_id)
       ABSL_EXCLUSIVE_LOCKS_REQUIRED(mutex_);
 
+  std::string InternalStatesToString() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mutex_);
+
   Mutex mutex_;
 
   WebRtcMedium medium_;