Merge "Clean up nlinterceptor dependencies" into main am: af0c909085 am: 70b3772076

Original change: https://android-review.googlesource.com/c/platform/system/connectivity/wificond/+/2775224

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