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

Change-Id: I09a6f75b9884a7c1ecc3a87502f1ace87210df97