Merge "TestNetworkService: add missing return statement" am: a530228ecd am: 89309b0be1 am: eb8fe81d5d am: 339aedeaf5 am: 1f6ae620e3

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

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