Merge "DscpPolicyTest Check Kernel Version" am: 5a2f079722 am: 8fefc6b45e

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

Change-Id: Iccfe4c1bb1c6f2ee3e5faa78f8490fe46a8259a4