Merge "Fix DscpPolicyTest EBADF" am: f36a025f38

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

Change-Id: I77eab9e4319953aeb50b44abdece6ed0bc5015d5