NetEq: Remove special case for Merge without Expand

webrtc/modules/audio_coding/neteq/decision_logic_normal.cc

Index: webrtc/modules/audio_coding/neteq/decision_logic_normal.cc
diff --git a/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc b/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc
index 37a75d7f5ad61714d9aa9c1a4708c7608f1cd983..ee11c466a8387825e72965488172d30f152eb3c2 100644
--- a/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc
+++ b/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc
@@ -207,12 +207,7 @@ Operations DecisionLogicNormal::FuturePacketAvailable(
     }
   }
   // Do not merge unless we have done an expand before.
-  // (Convert kAllowMergeWithoutExpand from ms to samples by multiplying with
-  // fs_mult_ * 8 = fs / 1000.)
-  if (prev_mode == kModeExpand ||
-      (decoder_frame_length < output_size_samples_ &&
-       cur_size_samples >
-           static_cast<size_t>(kAllowMergeWithoutExpandMs * fs_mult_ * 8))) {
+  if (prev_mode == kModeExpand) {
     return kMerge;
   } else if (play_dtmf) {
     // Play DTMF instead of expand.