[automerger skipped] Merge "Add new carrier config for CDMA registered PLMN when not roaming." am: c8eb9ef591
am: d7a5190868  -s ours

Change-Id: Id98081b344dd9bd9376adcbcff23f7d1506c35af