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

Change-Id: I63920fd33ef53f76f1af26a568b14dd6f88af691