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

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

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