Merge changes from topic "peruidcallback-cts" am: 65bba3f6bc am: ab98c8119d

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

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