Merge "support bpf_map_def struct size increase to fix map uid != AID_ROOT" am: 0bf7fa9355

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

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