[automerger skipped] Merge "[Telephony mainline] Use new util file to replace MccTable" am: 67837f7d6d am: 7b593e06af am: b9c56bee1a -s ours
am skip reason: Change-Id Iff365e0e1ddbf1700fe24d38fea66e4de30333b6 with SHA-1 c730df8698 is in history

Change-Id: Id06cb13de3f346388d998ae95fc0dcd066292507