Merge "Add Executors to NSD callbacks" am: 009094b070 am: 34759d1685

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

Change-Id: I2a82b634a73fac55117e4ea2c6ab011cd7b53770