Merge changes from topic "nsd_serviceinfo_network" am: 585b14d79c am: 2d8dd0e89c am: 50aefe8550 am: 639ae66673

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

Change-Id: I35e0a36eda4c5a4cc9111bedd8d4068efa75e830
tree: 465b4b78255d87e39a26afe4f41c8ada34b53591
  1. framework/
  2. framework-t/
  3. service-t/
  4. services/
  5. tests/