Merge "Register NSD service from ConnectivityFrameworkInitializerTiramisu" am: 78bed54352 am: a5b408dfa1

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

Change-Id: I70d0ad84b306d15e890cca70ac31eb711ebba198