Merge "BpfBitmap Test" am: b194d551bf am: 7fa056c024

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

Change-Id: I3d25319486122553c513594d4c79f40851b44e0b