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

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

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