Merge "Add new carrier config for CDMA registered PLMN when not roaming." into pi-dev