Merge "Remove unnecessary mocking in tearDown" am: 520417cc3e am: 8db1c85d74 am: beb1303146

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

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