Merge "offload.c - adjust bytes for l2 header" am: 58d800c94d

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

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