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

Change-Id: Iaf1300e912b5aa0054d8942cb2bfeaec87688591