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

Change-Id: Ib08e65d114cfacefc513bf12a845455868fb584a