Merge "[Telephony mainline] Use new util file to replace MccTable" am: 67837f7d6d am: 7b593e06af

Change-Id: I5a6709c5ec4e5207b9ea774dd5c5cb2fcdd3ea1a