Bug: 152356365 Test: atest CtsNetTestCasesLatestSdk:android.net.cts.NetworkInfoTest on both Q and R devices Change-Id: I44ffdc4b4a9ba8fcc1fda895b9d7f8f551fd6bb3 Merged-In: I44ffdc4b4a9ba8fcc1fda895b9d7f8f551fd6bb3 (cherry picked from aosp/1256248)