update to new apns config

Change-Id: Iedb3ebd209fbd66eb4c09daa2edccdf82b12fd96
Merge "update to new apns config" into android-4.4