tree 1c5c99622190eacc684396d4d6534d2f74d8e7a9
parent 7edc776afc052226a1bf82ed0f3868ca48c86d23
author Varun Anand <vaanand@google.com> 1558740562 -0700
committer Varun Anand <vaanand@google.com> 1559231947 +0000

Addressing comments for http://ag/7700679.

(cherry picked from commit 78d5ac4f8f5dfbd0b771f1ade8b28914074d5a2a)

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

Bug: 113122541
Bug: 120145746
Test: atest FrameworksNetTests

Change-Id: Ic1767bc8bf1460e4223f86465fc72344428e6055
Merged-In: I7cfda226b4ed11b67002b83b38fba0f5caf96718