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

Change-Id: I3e0ad104f387d0fb0230de6c27e606b7753e8dd4