Merge "Remove obsolete solution for support ApfV6 opcode." into main am: 04658f72b0 am: e6224ab8b5 am: 1aec51de5e

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

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