Merge "Move APFv6 opcode addition APIs to ApfV6Generator" into main am: 7a88feb1fd

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

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