[automerger skipped] Merge "Add updateMccMncConfiguration as @TestApi for CTS"...
[automerger skipped] Merge "Add updateMccMncConfiguration as @TestApi for CTS" into rvc-dev am: aa49e5b7 -s ours am: 963a8ca1 -s ours
am skip reason: Change-Id I63288be1acd9e898548ced345799ac1ae69ce427 with SHA-1 501a606c is in history
Change-Id: I1224a53d19361dbd43cf9c8cad2abafe7f908f0a