Merge "Get carrier_id attribute in apns-full-conf.xml"
am: 5f4ec6c321

Change-Id: I4d2d66d4f40c302a7c99194dcd6d835167c9bacf