Merge changes I73f30477,I84db13ac am: 2f1c2b25cd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3df71008b8801047660b9ccc15158fb76211b5c
tree: 433f4fc6aed09bf1d274d9612210ffd2559af01a
  1. framework/
  2. tests/
  3. Tethering/
  4. .gitignore
  5. OWNERS
  6. PREUPLOAD.cfg
  7. TEST_MAPPING