Merge cherrypicks of [19048272] into tm-release. am: 82eed90a20 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19059072 Change-Id: I2bc1e7b6515b0cbd8c00223294a9844c0c42f8c4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>