Merge "Add length option into ICMP packets" am: 441a32e39d am: fffdba0d31

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

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