Merge "Fixing the testtracker UUID conflict issue" into sc-dev am: 9ccb4f1d97

Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/test/connectivity/+/16678378

Change-Id: I19233a4a54604ed832779952167cf650bb4c5255
tree: 40e170bbefe98aaa3c3f69bb1df92903a03e6609
  1. acts/
  2. acts_tests/
  3. tools/
  4. wts-acts/
  5. Android.mk
  6. OWNERS
  7. PREUPLOAD.cfg