Merge "netd.c - nettrace - add support for icmp type/code & udplite/sctp ports." into main am: f10d3af3d4 am: 630c5f97fd

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

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