[automerger skipped] Merge "Add updateMccMncConfiguration as @TestApi for CTS"...
[automerger skipped] Merge "Add updateMccMncConfiguration as @TestApi for CTS" am: af0d638e -s ours am: b9157581 -s ours am: e44c7739 -s ours
am skip reason: Change-Id I63288be1acd9e898548ced345799ac1ae69ce427 with SHA-1 1f324f69 is in history
Change-Id: I647cc30b847bf1d9b026399e4024cd5d6e0b6fac