Merge "TestNetworkService: add missing return statement" am: a530228ecd am: 89309b0be1

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

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