[automerger skipped] Merge "Move net unit tests to packages/Connectivity" am: 5b48156498 am: 47152e05a6 am: 78aa012678 -s ours

am skip reason: Merged-In I254ffd1c08ec058d594b4ea55cbae5505f8497cc with SHA-1 678277cc03 is already in history

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

Change-Id: I8d08b8919e4b0dc129363e3e715374b22c4a3c0d