Merge "Add the operator name and MCC/MNC in string format into the CellIdentity." am: 1565803cd2
am: e64d907a49

Change-Id: I0f145a458bff20dd9e6484120331bcc59b2dd8d3