Merge "Add executors to NsdManager" am: b58df4bf13

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2027043

Change-Id: I93294667e79684652dba065583e651148a8d0991