Merge "Update dumpstate code that dumps BPF maps." am: 254a055643

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2107967

Change-Id: Ia119e0ba99af16b527f39f5480469c937f195361
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>