[automerger skipped] Update dumpstate code that dumps BPF maps. am: 006509ad7d -s ours am: fcfda777ae -s ours

am skip reason: Merged-In I7b50ffcc62f04c336379fbbd7ea0106a91aac15f with SHA-1 807f2ddf2c is already in history

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

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