Merge "DscpPolicy BPF Rename Field Names" am: 81ee9c4f1a am: 69b9e1a8b9

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

Change-Id: I1581c59d442468abd18b1b5a670c4925d8c0e371
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>