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

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

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