Merge remote-tracking branch 'aosp/main' into HEAD am: 6bb6fcffe3 am: 1b2051213e am: 7ba1988efa

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iputils/+/25104355

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