Merge "Make CarrierText handle multi-sim" into lmp-mr1-dev