[automerger skipped] Merge "Adding API in TelephonyManger for updating...
[automerger skipped] Merge "Adding API in TelephonyManger for updating Fplmns." am: 32eb9171 am: 02f0815d am: 262d0da5
am: 3950b200 -s ours
am skip reason: change_id Id19ae55cc03efbd085314e9d0026ca2486e9755d with SHA1 c245257c is in history
Change-Id: I2a5195fac796be14a9cd2743ab90ef320586dbbd