[automerger skipped] Merge "Get carrier_id attribute in apns-full-conf.xml" am: 5f4ec6c321 am: 000b13d3de
am: 33ffbaa2b9 -s ours
am skip reason: change_id I9f33348534a15b647e592f62a879652f2ac62093 with SHA1 3e05795eb9 is in history

Change-Id: I5fd240a1fda8e0789b241af0a93174d60a6374e8