Merge changes from topic "conn_resources_cp" am: 016e0b9261 am: 16763614c0

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

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