[automerger skipped] Merge "Add updateMccMncConfiguration as @TestApi for CTS" am: af0d638e98 -s ours am: b9157581bc -s ours
am skip reason: Change-Id I63288be1acd9e898548ced345799ac1ae69ce427 with SHA-1 1f324f6960 is in history
Change-Id: I8e815d0d7867c99254f834bb361aa361c106ef74
This commit is contained in: