Merge "Add CTS test to test OperaterInfo and MCC/MNC for CellInfo." am: e4f6769476
am: c032b0fd04

Change-Id: I102f701cd6174178ff4bc077e97258910500fbe6