Merge "Add key / value data structures for IBpfMaps" am: 1962b10531 am: 06e0f144cb

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

Change-Id: I3f863cf5cfb50cb215391abe62e113aecd6b8e13