Merge "Remove unnecessary mocking in tearDown" am: 520417cc3e am: 1c370c647a

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

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