Not sure where this delta came from... seems like somebody chose BASE on a 3-way diff or something

Change-Id: I3df993ef1926af72f3bf1ecf8f39351064a78fd6
MccTable: add backwards compatibile updateMccMncConfiguration overload

Change-Id: I243a49658cbd9958f1b331bd4da3f12b5043ab70