Merge "Map the APN "wapaccess.con.nz" to Skinny carrier id"
am: dd57abc087

Change-Id: Idfd4f9df6608ed26146d6bbc54aa6425b55be49a