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