am 2168062b: am 0a1eb640: Merge "Carrier text handle sim removal" into lmp-mr1-dev automerge: a50a668

* commit '2168062b23c8c343330f9a7b074a51efc4780cde':
  Carrier text handle sim removal