[automerger skipped] Merge "Split out the nsd API surface and use framework-connectivity-tiramisu" into sc-v2-dev-plus-aosp am: 5fd5d0070d -s ours

am skip reason: Merged-In I72c7de124b9cc53f2263bd452ecd5f39e88e485b with SHA-1 0aab7c039d is already in history

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

Change-Id: I27faed9c517b2803392b3d797e28d5f819f39e1c
tree: 7d6dfd42ba395485d1f3aec44060ab465df0d0cb
  1. core/
  2. framework/
  3. framework-t/
  4. service-t/
  5. services/
  6. tests/