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: Idf409e9d933b5a92e90597bcc3d8e9f16fa17b70
tree: 6788488a272ee3060d450f76742a3557ebeb97eb
  1. tests/
  2. Tethering/
  3. .gitignore
  4. OWNERS
  5. PREUPLOAD.cfg
  6. TEST_MAPPING