Merge "Register NSD service from ConnectivityFrameworkInitializerTiramisu" am: 6a8b9f3964

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1899035

Change-Id: I658096512da1c4eaa6b60691f6f226b86adb44fe