Bug: 152238712 Test: FrameworksNetTests NetworkStackTests Change-Id: I6b086572cfc72a0727f4510351cff0e74cbc4302