Merge "Adjust strings for select SIM dialog"
am: 3fbdd1c482

Change-Id: I7283753d282b15fd2a76f76a3921ed692af3e117