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

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

Change-Id: Iebc2e9ca34e71467a625d3646f1449e8c927b932