Merge changes I969d6182,Ie73f7b4d am: 2668d4a0e2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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