Bug: 129200415 Bug: 129200142 Bug: 129200418 Test: atest FrameworksNetTests Test: atest CtsNetTestCases: added tests pass Change-Id: I688e200a83301ee62710445fa38292c33985fe1b Merged-In: I49c35541eb21e91f8c36215456df703d2fe70d2c Merged-In: I688e200a83301ee62710445fa38292c33985fe1b (cherry picked from commit 847dc65677b858146b505d4879a44ddd319180e2)