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

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

Change-Id: Ib0593c1c5ff58b94ba78a529081b9dbfa50dff3e