tree 76ae6e41d79fa5e11f4202f98d37fbcece3653a2
parent 87a9bc7edba09fe74241cdf20232d05fd27a6b31
parent 55a3c9f8949c460db880d9b106e49805df5e0365
author TreeHugger Robot <treehugger-gerrit@google.com> 1654254889 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1654254889 +0000

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