Merge "TestNetworkService: add missing return statement" am: a530228ecd am: b68759814b

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

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