update to new apns config

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