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

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

Change-Id: Ibaa3715a29c1e3ca5eb344ba7ae36762bdd0597a