Merge "Fix DscpPolicyTest EBADF" am: f36a025f38

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

Change-Id: I41437a71a90d236d496c5d6e470e2154ea7932cf