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

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

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