[automerger skipped] Merge "Clean up nlinterceptor dependencies" into main am: af0c909085 am: 70b3772076 am: 9fc38745ca am: 66da9787cf am: cf967ec7d3 -s ours

am skip reason: Merged-In I9babe7c3e1667eeb98314d0c6e46a5185d868550 with SHA-1 875673e206 is already in history

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

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