Merge "Remove last NetworkStack usage of hidden APIs"
am: 16ec5d038c

Change-Id: I27c78d09938f672a4428a17436d5ed0541170d0d
tree: f4d8e004ee56e5344e4df14abdd9e2635763ce6c
  1. core/
  2. services/
  3. tests/