Merge "Quick fix the getMobileNetworkOperator() in CellIdentity."