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

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

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