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

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

Change-Id: Ieca4be43c271c51732175b9d47ce7e3e72bb8aab