am 54380c74: Merge "Fix CarrierText airplane mode with no sims" into mnc-dev

* commit '54380c741bce96a35a5e9df0a8722c3cf5cd4e35':
  Fix CarrierText airplane mode with no sims