Merge "Add updateMccMncConfiguration as @TestApi for CTS" into rvc-dev-plus-aosp am: ab993e20 am: 5d2d3feb Change-Id: Iaea8084f5875f97eef7f45ad8bc1a8d64e04a456