Merge "Add updateMccMncConfiguration as @TestApi for CTS"