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

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

Change-Id: I566aba16c428ad673360542cf880a2669948a6c5