update to new apns config

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