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