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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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