Merge "Fix DscpPolicyTest EBADF" am: f36a025f38 am: 4d9a4e8b00

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

Change-Id: I9b0cf80ce5cee2cec41f75abb79f9ddf0fd1381a