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

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

Change-Id: I7605f8332f30f88036be92af0fcb7aa986a7dfb8