Bug: 129199900 Test: atest FrameworksNetTests Test: atest CtsNetTestCases: added tests pass Change-Id: I737ab11ccd1bf6f92bae4eae21e67d4d6f86a758 Merged-In: Icfd80943212430b2a0e6a4b55f53270cbc3d1693 Merged-In: I737ab11ccd1bf6f92bae4eae21e67d4d6f86a758 (cherry picked from commit ce54fa5cb392c38bfec62b81664fcc25098eb9dc)