Merge changes from topic "attach_bpfprog_in_mainline" am: 3357388742

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I846f007b1da04929826d4c687b93d7c3a6f56185