[automerger skipped] adjust for newly added bpf map/prog definition fields in T+ am: ce6cdc8e16 am: ef57c5c770 am: c1ddaa4037 -s ours

am skip reason: Merged-In I0a37e59760fb0b55e6d6a6d12d5fd40106accd55 with SHA-1 ce6cdc8e16 is already in history

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

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