tree cdd3b991ff7a1c6bf27a258d8a61fbee4ffda04d
parent ed11b84131eae1e104af9be2c17fc9b07183eee3
author Varun Anand <vaanand@google.com> 1558740562 -0700
committer Lorenzo Colitti <lorenzo@google.com> 1559121334 +0900

Addressing comments for http://ag/7700679.

Note, that its in a separate CL so we could cherry-pick this CL to aosp.
http://ag/7700679 is already in aosp.

Bug: 113122541
Bug: 120145746
Test: atest FrameworksNetTests

Change-Id: I7cfda226b4ed11b67002b83b38fba0f5caf96718