Merge "dscpPolicy - remove bpf byteswap in favour of userspace" am: f39f7f83b0 am: 6d66da9f7b

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

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