Bug: 138306002 Test: builds, boots Test: atest FrameworksNetTests Change-Id: I6b9979f343108c0c077abd86ae1c21e5ece0cccc