[automerger skipped] Merge history of CTS am: d59fc536de -s ours
am skip reason: Change-Id I91190d8644ff7a7dfaf4fa3f2d43c17f67dfac11 with SHA-1 fcabfc688d is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13051330
Change-Id: Iaf07c739fa8b2db06711599233c4e72f729731a6
This commit is contained in: