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

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

Change-Id: I0951a45722fbc3901f129f49ead7331e95297e6b
Signed-off-by: Automerger Merge Worker <[email protected]>