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

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

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