Merge "Create NetHttpTests target" am: 184ba4059e am: a620fc50a4

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2419324

Change-Id: I00576ae5d83302973341db2c42f5963a24a6754d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>