am 16ee60a5: Merge "Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes." into ics-mr0

* commit '16ee60a5ae0336a46a417a72bca64a1a04b0fce2':
  Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes.