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