Clean up apns-conf.xml

Change-Id: Ib7706a2cb690a4e3673b60067208daea6aee27c6