DO NOT MERGE Keep APNs same as M for Canada carriers. am: ea21b82a70 am: 667d9b92c8
am: 688c397fe8

Change-Id: Ie831f21c352040f4bb8265e605b9e055dc29a8a1