Merge changes I8cd6e49b,Ibb52c7b7 am: dc4189f0e4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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