Merge "Don't use APNs xml if CarrierSettings is installed"
am: aa63799915

Change-Id: I6a9fa087f66b747d502f9136751d5b007a48bd8e