[automerger skipped] Merge "Removes duplicated filter setting" into main am: 6de75676 -s ours

am skip reason: Merged-In Idbf2918bae00b31ebb31f3f09590e32b4eb0ebc2 with SHA-1 e6195f3d is already in history

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



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