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

Change-Id: I59b6ce32cb7e479d8843813052021134487a80e5