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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I041c6fbd65444d1a01387038e0dfabb6b33944ba
tree: f3c4eece86091769f9bf37ab150bc653e72ce937
  1. tests/
  2. Tethering/
  3. .gitignore
  4. OWNERS
  5. PREUPLOAD.cfg
  6. TEST_MAPPING