Merge "Add executors to NsdManager" am: b58df4bf13 am: e37221c61d

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

Change-Id: I27b2ed706bcb3242600c65daaee8b5aa6a51a910