Merge "Fix DscpPolicyTest EBADF" am: f36a025f38 am: 2db0cc10bb

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

Change-Id: Ica017abf0ed71b7484b215936fa2174b52267ca2