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

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

Change-Id: If94a0b81a309fd39165f1e8005103d8a1ab6e01f