Bug: 139268426 Bug: 135998869 Test: atest FrameworksNetTests Change-Id: I687f1a8a4b82cb7e4a0dfeb24f0b23a4de6d5287