[automerger skipped] Merge history of CTS am: 43e624246b -s ours
am skip reason: Change-Id Ic89c084604788b4d41cf854e5015c8ce7791c64d with SHA-1 1711a1222c is in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1480699
Change-Id: If81ced42e55230b210d42238ce244e6f1620dc07
This commit is contained in: