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

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

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