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

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

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