Merge "v5: use add{Packet|Data}Offset() in the code for better documentation" into main am: c5bdd88350

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

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