Merge changes Id87b88f6,I67dfba75 am: fab97c22b2 am: 68a007c616

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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