update to new apns config

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