Merge "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel." am: 45e1c58591
am: 59439e38a6

Change-Id: Ia6ff98854a32b54b5f4a2bb8c5b533e62ff27b65