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

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

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