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

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

Change-Id: Ie7bcd2fcf8d0507b5f4edf180a2fbc1ba2ff2d91