Merge "DscpPolicyTest Check Kernel Version" am: 5a2f079722 am: 15e079b6ba

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

Change-Id: Ic6dbb350acd505f0c29a6997051cb11222e52806