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

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

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