Merge changes from topic "move-testbpfmap" am: f7d2824956 am: 7dabc4b638 am: 3372f0155f am: 87b704f07c

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

Change-Id: I14db0e51b786d0bede6295acb3f097eb0d65cce7