Merge "Use correct PLMN info for an incoming CB-SMS" am: 74a0dd8092
am: 625155b12b

Change-Id: Ic80cc13e133ac1a7364819e6166476d9af8dddbe