Merge "Set AuthType to NONE if username of APN is not set"