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