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