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

Change-Id: I980c8ac154e7b6d4f766e2e9a503673acfe149a1