[automerger skipped] Merge "Move net unit tests to packages/Connectivity" am:...

[automerger skipped] Merge "Move net unit tests to packages/Connectivity" am: 5b481564 am: 78a1add7 am: 2773acc3 -s ours am: 0ead400f -s ours

am skip reason: Merged-In I254ffd1c08ec058d594b4ea55cbae5505f8497cc with SHA-1 007a886b is already in history

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

Change-Id: I6dc00771280984d370637422f8a78b42a4efa899