Merge "Update APN config for Altan to remove SPN match rule"