Merge "Revert "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel."" am: 9b08e4cb8d am: 866d2d553e
am: 03e7512fc7

Change-Id: I344283ebf5971461f8aa2d712546b7715f090dbf