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

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

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