Merge "Fix teardown crash when kernel version < 5.4" am: 03c8a7a6a1

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

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