Merge changes from topic "nsd_serviceinfo_network" am: bf13de3b19 am: 902c1d6f8e

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

Change-Id: I4ec5220c269ebe830c4c8682aeabedbbbc276759