Merge changes from topic "bpfmap1" am: 8f03c4495e

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

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