Merge "bullhead/apns: Update apns-full-conf.xml" into mnc-dr1.5-dev