Merge "Register NSD service from ConnectivityFrameworkInitializerTiramisu"