Merge "Add new carrier config for CDMA registered PLMN when not roaming." into pi-dev am: fffc3080 am: 93c577b2 Change-Id: Ie635c49b097d758c96e882249a4b0ad61c85b730