Merge changes from topic "nsd_serviceinfo_network" am: bf13de3b am:...

Merge changes from topic "nsd_serviceinfo_network" am: bf13de3b am: 902c1d6f am: 7865fe3f am: d2e05896

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

Change-Id: I35e0a36eda4c5a4cc9111bedd8d4068efa75e830