Merge "Add executors to NsdManager" am: b58df4bf13

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

Change-Id: I4a3ceeb3f7d2897042592f3728c0b0ee32286559