Merge "Remove an NPE in tearDown" into main am: e7b7ceb70d am: ddd00cd23a am: 3022442e71

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

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