Merge changes Iaac422d7,Ia7638b31 am: 0913a7a415 am: 51875f6043

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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