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

Change-Id: I3c0008571b478f997aa1257a1e6e1c7540816688