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

Change-Id: I34d445c50be6f40e00df5a776208e12ceef49f4e