Merge "move bpf test map into a separate file" am: ab44322f9c am: e15c4e0281

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I92792b09a33e78a86ecaa96a70654a3bca181335
tree: 77b0331333c5aeae0dd4171d53f7aabfc0eeedfb
  1. framework/
  2. tests/
  3. Tethering/
  4. .gitignore
  5. OWNERS
  6. PREUPLOAD.cfg
  7. TEST_MAPPING