Merge "Fix to correct the filter setting in order Patched from ag/23208840" into udc-dev am: d2f58d0d7e

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

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