Test: atest android.net.ConnectivityManagerTest Bug: 188657173 Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f Merged-In: I33612650eb89486a14fcfc440ba0c357f4bb513c Change-Id: I33612650eb89486a14fcfc440ba0c357f4bb513c (cherry-picked from ag/14640282)