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

Change-Id: I813c193b1c9d68f524ad74d21f0616516edc18d6