update to new apns config

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