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