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

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

Change-Id: I11eb0af16e7fd3138d8f9656f3504ffcdb4c3237