Merge "Remove obsolete solution for support ApfV6 opcode." into main am: 04658f72b0 am: 77fd38ea62

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

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