Merge changes from topic "cherrypicker-L48400000954920366:N08700001270826034" into tm-dev

* changes:
  Disable NsdManager tests that need a new prebuilt
  Ensure callbacks are run properly on executor