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: Iec7fc872ec296ef2a9f6bb251bec001e44ee015b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>