Merge "added new APNs to apns-full-conf.xml"
am: 1f9a49b871

Change-Id: I5cc714e828d3092962dc5dde831b09a018e51138