Merge "Create NetHttpTests target" am: 184ba4059e am: 23e20b5613

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

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