update to new apns config

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