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

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

Change-Id: Ief40c29dce0484983f95d66d8506a24b35a46b30
tree: 11fa2f3d2769e07647d035ca2031cb3b2fd496ec
  1. framework/
  2. framework-t/
  3. service-t/
  4. tests/