[automerger skipped] Merge "Introduce system API for ActivityManager.updateMccMncConfiguration for Mainline" am: d301f3fd8e am: b3720cd31c -s ours am: f3b6a1bd6d -s ours
am skip reason: Change-Id Ieef1dbbab3b05fc166c3dbc53ed2507ef45d09d7 with SHA-1 b9c9bfa6e8 is in history
Change-Id: I3d5e1d2300eb65b93820cba5e3afe2070c8ea0d7
This commit is contained in: