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

Change-Id: I1afee7200c84bc0058ce394c49eaaf46a917793f