Bug: 131797393 Test: atest FrameworksNetTests Merged-In: I171bd5e22b5afd5c62029392af627d7bdfe32161 (cherry picked from commit 1083b27f7c30d6ccfd8a6f4402788b4b4789ef60) Change-Id: I23019658acfec18d342d38e8c189dcfaeb7b6f4a
Bug: 131797393 Test: atest FrameworksNetTests Merged-In: I171bd5e22b5afd5c62029392af627d7bdfe32161 (cherry picked from commit 1083b27f7c30d6ccfd8a6f4402788b4b4789ef60) Change-Id: I23019658acfec18d342d38e8c189dcfaeb7b6f4a