Merge "Remove APN type in notifyDataConnection."