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

Change-Id: I323094f0f83748ea4e9d5c78a455b8151f065414