Merge "dscpPolicy - remove bpf byteswap in favour of userspace" am: f39f7f83b0 am: 56ed1513b8

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

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