Merge "Add key / value data structures for IBpfMaps" am: 4a53677d10 am: 10c372e521

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1969201

Change-Id: I3f863cf5cfb50cb215391abe62e113aecd6b8e13