Merge "netd bpf - no-op code hygiene fix for DROP_UNLESS_DNS" am: bfb28d7014 am: cc779fbd31

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

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