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

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

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