Don't use APNs xml if CarrierSettings is installed am: 3de76f8ca4  -s ours
am: 4918865ef5  -s ours

Change-Id: Iad995250a3f4b080aea27d789491b69be1e682f5