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

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

Change-Id: I1b9ec283274aa162ee1e5d5165caa221965b7bbf