[automerger skipped] Merge "Move net unit tests to packages/Connectivity" am: 5b48156498 am: 8c3d83c0cc am: 4f15e675cd -s ours

am skip reason: Merged-In I254ffd1c08ec058d594b4ea55cbae5505f8497cc with SHA-1 65b8995a15 is already in history

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

Change-Id: I8d08b8919e4b0dc129363e3e715374b22c4a3c0d
tree: e2f4f05348b85fe252ed6aecf898bd80ae1cf22b
  1. framework/
  2. service/
  3. services/
  4. test/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING