Merge changes I71a37663,Ib2010b38 am: fd710547b2 am: c241c0f4f3 am: c2717c6242

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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