Merge changes I515be275,Ied159454,I5a29bdd1 am: 8ba40704f3

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

Change-Id: I220f3384baa2414dc7aad6e5754b59e6d3592bdc
tree: b1c2b394a0a994a2a7e50b144ce9a92d7addbcf1
  1. tests/
  2. Tethering/
  3. .gitignore
  4. OWNERS
  5. PREUPLOAD.cfg
  6. TEST_MAPPING