Merge "Fix DscpPolicyTest EBADF" am: f36a025f38 am: 2db0cc10bb am: d6b408b9cf am: 68f5c767ef

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

Change-Id: Ie46b6fffeafef97606ac5c8f02bef81e939823e5