Reland of New statistics interface for APM

webrtc/modules/audio_processing/echo_cancellation_impl.cc

Index: webrtc/modules/audio_processing/echo_cancellation_impl.cc
diff --git a/webrtc/modules/audio_processing/echo_cancellation_impl.cc b/webrtc/modules/audio_processing/echo_cancellation_impl.cc
index e06b2faa84df7e46035294bbe84174c9472eb083..0b8fc141ee50985f8bf17c540ccdb55c9da17cf5 100644
--- a/webrtc/modules/audio_processing/echo_cancellation_impl.cc
+++ b/webrtc/modules/audio_processing/echo_cancellation_impl.cc
@@ -270,7 +270,7 @@ int EchoCancellationImpl::enable_metrics(bool enable) {
 
 bool EchoCancellationImpl::are_metrics_enabled() const {
   rtc::CritScope cs(crit_capture_);
-  return metrics_enabled_;
+  return enabled_ && metrics_enabled_;
 }
 
 // TODO(ajm): we currently just use the metrics from the first AEC. Think more
@@ -333,7 +333,7 @@ int EchoCancellationImpl::enable_delay_logging(bool enable) {
 
 bool EchoCancellationImpl::is_delay_logging_enabled() const {
   rtc::CritScope cs(crit_capture_);
-  return delay_logging_enabled_;
+  return enabled_ && delay_logging_enabled_;
 }
 
 bool EchoCancellationImpl::is_delay_agnostic_enabled() const {