Merge "bullhead/apns: Update apns-full-conf.xml" into oc-mr1-dev
am: b5523eca2a

Change-Id: I6bd079c3458cbf2fe25fce826370b29e00459bc1