Merge "Don't use APNs xml if CarrierSettings is installed" am: aa63799915
am: 4c33c8cd0b  -s ours

Change-Id: I5bad51458b15cc130395bb8cd4df8364caf886f6