Merge remote-tracking branch 'aosp/main' into HEAD am: 6bb6fcffe3

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

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