Merge "Add APNs for some carriers"
am: d3f3472b22

Change-Id: I2cb0200b83cd25defada0f54f2c9dea91b8194e2