[automerger skipped] Merge "Add updateMccMncConfiguration as @TestApi for CTS" am: af0d638e98 -s ours

am skip reason: Change-Id I63288be1acd9e898548ced345799ac1ae69ce427 with SHA-1 a14185aad4 is in history

Change-Id: Idf8af8819a7be3171a53ca5aea4e33737f0f3e64