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

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

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