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

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

Change-Id: Icc366aa3bc3eabfb11f84a51add49eb66b4d753a