Merge "Quick fix the getMobileNetworkOperator() in CellIdentity." am: 298d2a46dc
am: 3ba72e7130

Change-Id: I426e70c17a222773267b0c482c930ccdb0c20b4a