Merge "Add tests for getMccString and getMncString" am: 43b3e99e14 am: 56ee9ca2ed
am: 2ee8c57846

Change-Id: I82dc952a265b52775ae5501fb18ea53d8f3a3d79