Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev

automerge: c7f1ae8

* commit 'c7f1ae8146d3f4bb9e8e1c0e58543379b854060e':
  Fix NPE when parceling SubInfoRecord

telephony/java/android/telephony/SubInfoRecord.java

@@ -250,7 +250,7 @@ public class SubInfoRecord implements Parcelable {
         dest.writeCharSequence(mDisplayName);
         dest.writeInt(mNameSource);
         dest.writeInt(mColor);
-        dest.writeString(mNumber.toString());
+        dest.writeString(mNumber);
         dest.writeInt(mDataRoaming);
         dest.writeIntArray(mSimIconRes);
         dest.writeInt(mMcc);