Merge "Introduce system API for ActivityManager.updateMccMncConfiguration for Mainline"