Merge changes Ibe325714,I44f3dc9e am: 63be468bf4

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

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