update to new apns config

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