[automerger skipped] Merge "Merge Android 12L" am: a69acc78ec -s ours am: 8fcec77ac0 -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: I7e437655a88851c8277a76aaea8379d368a1e531