am 258208a7: Merge "Remove SIM operator name hack" into honeycomb-LTE

* commit '258208a78ca90a7d3a45a2f15af4bbb21a266f47':
  Remove SIM operator name hack