Merge changes from topic "attach_bpfprog_in_mainline" am: 3357388742 am: 5254c0c243 am: f0424798ce

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I273c010442ac10a5dda26a0c4a1fe8128853bb99