Bug: 131133347
Test: atest FrameworksNetTests
Merged-In: I8ce3bed435fbbb814d71fe48ffd305ff3f947f3f
Merged-In: I1db13a48b59d743482436ecf8a20d7f12edd6e1c
(cherry picked from commit 7567c4ac50)
Change-Id: I78024c0e25d812639d1236faa59d383742ae2141
Bug: 131133347
Test: atest FrameworksNetTests
Merged-In: I8ce3bed435fbbb814d71fe48ffd305ff3f947f3f
Merged-In: I1db13a48b59d743482436ecf8a20d7f12edd6e1c
(cherry picked from commit 7567c4ac50)
Change-Id: I78024c0e25d812639d1236faa59d383742ae2141