Bug: 134352656 Test: atest android.net.cts.ConnectivityManagerTest (--instant) Merged-In: Ia7b1111abe687efad032a8c9205990c97a769fcd Change-Id: Ib6b01356d785c5b7684520eef9f9d1fe48187582 (cherry picked from commit 8550488c7cf0c0ab2af06189aca5ad50c39e5276)