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

Change-Id: Ie0a1305eb73256f358a853d87778f755d3b9e4d0