update to new apns config

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