tree bf6218a48fa1cc16a1583c3e38f19f2463d9c7a8
parent 98a9f79d02843c8926e2336a87d3b5c8fe78c81c
parent 77fb999ed0ac7e0e30e00238f616869222578dd6
author Lorenzo Colitti <lorenzo@google.com> 1624404071 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624404071 +0000

[automerger skipped] Merge changes from topic "connectivity-cts-cherrypicks" into sc-dev am: 77fb999ed0 -s ours

am skip reason: Merged-In I55371fabe0d2fa32a71520af11f18f1eeea31460 with SHA-1 56bc7d4dde is already in history

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

Change-Id: Idd1c11ab2b2444fb739b039420acabf080276eaf