am 5b08738a: Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1

* commit '5b08738a62ece5bf0ca5d22a6f062e2fb67af272':
  Suppress mobile-out-of-service label if wifi connected.