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

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

Change-Id: I58bb3bb5a9b9b802ef65edab0131f00beb1ba50d