Merge "Supported the legacy allowed initial attach APN types config"