Merge "Add Executors to NSD shim" am: 48bc77cb7f am: 8a8ddf1762 am: bc0eeb5c2c

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

Change-Id: I79cea6266bc4ea13176ecfa9633f254616835d9e