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

Change-Id: Ia9b962160b57810a84feef1a3a2cb184d504afca