tree 7e9973245bcc75cc43d11300fdd98c407ea554fb
parent 9d7806096df8f798bc24095c008a93dc157790c0
parent 8fcec77ac04d40b332c44448a2487d7e19349d77
author Xin Li <delphij@google.com> 1646737674 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646737674 +0000

[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