Merge changes I969d6182,Ie73f7b4d am: 2668d4a0e2 am: d3e7c33b2e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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