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

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

Change-Id: I9e6060121b65d55917d403614161a97b3ec2a2a2