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

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

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