Merge changes from topic "bpfmap1" am: 304c8ac2db

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/2124146

Change-Id: Ia5960ad5afd430cebd14602a2dab1f225787aa25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: fc752481ac12d6f8c13b0e124729fee9bde1debd
  1. staticlibs/