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

Change-Id: I27c78d09938f672a4428a17436d5ed0541170d0d
tree: 6110524f15779bec89f954ceafd56cfac88d9296
  1. core/
  2. services/
  3. wifi/