Merge "Telephony: simplify apns-conf.xml loading logic" am: cf08863109
am: 71984a0088

Change-Id: I994b958e266c6d1ac58d64dd297aaf7b5c095cfb