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

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

Change-Id: I072796b2faf6b4e111d65ccc5d5342f182099ed2