Merge "DscpPolicy BPF Rename Field Names" am: 81ee9c4f1a am: 1c4034c350

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

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