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

Merge "Update dumpstate code that dumps BPF maps." am: 254a0556 am: a7ff46e3 am: ebfd623f am: 77976a66 am: 858ebdc3

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



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