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

Change-Id: Ibb4da790356f3a8061182b334d1b54a2992d4e68