[automerger skipped] Merge "Use ActivityManager System API to update Mcc/Mnc...
[automerger skipped] Merge "Use ActivityManager System API to update Mcc/Mnc configuration in Mainline" am: bc494612 am: c480a8ba -s ours
am skip reason: Change-Id I102b4b54c9e7da691f8edd1a0f3349ace62a13f8 with SHA-1 7a8a74b9 is in history
Change-Id: I82addd5a516dfa2b4539d13f90f370d179ca0277