Merge "Test conntrack event monitor on R" am: d5f07c1243 am: 4c9bfb1fbd

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

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