[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 skip reason: Change-Id I63288be1acd9e898548ced345799ac1ae69ce427 with SHA-1 1f324f69 is in history
Change-Id: I8e9058e3aa46c059aadae2af0d71122e0d8cf08b