Bug: 186061922 Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest Test: atest CtsNetTestCasesLatestSdk Original-Change: https://android-review.googlesource.com/1730545 Merged-In: Iba312defb6f02896eac518d71d36f1ef3df3d00b Change-Id: Iba312defb6f02896eac518d71d36f1ef3df3d00b