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

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

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