Merge "Dump BPF map in base64 encoded strings for testing" am: 61ef984d52 am: 75bba5eace

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

Change-Id: I8c646cae78dff91605e3b3a147624e02041d2815