Merge "Do not open BPF maps when running on R." am: d12f867cb0 am: 9bcb23851b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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