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

Change-Id: Ie3b068b965c2c5f8f7b191ac801d2e98194011ae