Merge "reverse BpfMap & BpfMapRO inheritence to make sense" into main am: d58042e0d4

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2767825

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