Merge changes from topic "move-testbpfmap" am: f7d2824956

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

Change-Id: I7736b8f7b0608d215e3411fb95820a73e5658c2f