Merge "netd.c - nettrace - add support for icmp type/code & udplite/sctp ports." into main am: f10d3af3d4 am: 0bcf94dbc7 am: 6f66e7a368 am: 2f933f4df7

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

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