Merge "Set correct address and type when reading SMS on the ICC" am: 3ef502c9a6 am: 0d47fd6fe8
am: a4c8d2c599

Change-Id: I6f8b99bac8ade593db70a16676e2c18918e07bfa