[automerger skipped] Merge Android 12L am: 116a308b4d -s ours am: 0f844ea48c -s ours

am skip reason: Merged-In I94d2a00d5c2840b4a823abe7977c60fa98fe98e8 with SHA-1 06a4e1247e is already in history

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

Change-Id: Iba1efdced574741bfc349f969eaf2f399f561f95
tree: 7e9973245bcc75cc43d11300fdd98c407ea554fb
  1. acts/
  2. acts_tests/
  3. tools/
  4. wts-acts/
  5. Android.mk
  6. LICENSE
  7. OWNERS
  8. PREUPLOAD.cfg