[automerger skipped] Merge "Register NSD service from ConnectivityFrameworkInitializerTiramisu" am: 6a8b9f3964 am: f9ed5725da am: 2755887938 am: 208d820e96 -s ours

am skip reason: Merged-In Ibf89ab9a35e35dac4978ba70c7ab306b6155a4a3 with SHA-1 eb3dd7939f is already in history

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

Change-Id: I929428c369f61a5ecfc782556295745eb1290868