Merge changes Iaac422d7,Ia7638b31 am: 0913a7a415

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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