Merge changes from topic "nsd_serviceinfo_network" am: 585b14d79c

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

Change-Id: Ia0a3c75269dd5b125292235360e2e7ba0cefd9ca