Addressing comments for http://ag/7700679.

(cherry picked from commit 8031acad0e8059020df23a8258b7c2e0ab2bbd8b)

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
2 files changed
tree: 1c5c99622190eacc684396d4d6534d2f74d8e7a9
  1. core/
  2. services/
  3. tests/