Merge "Add Executors to NSD callbacks" am: 4ab6dfe71a am: dcbad3413e am: 2624d9465c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2027063

Change-Id: Ief40c29dce0484983f95d66d8506a24b35a46b30