Merge changes I71a37663,Ib2010b38 am: fd710547b2 am: c241c0f4f3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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