Merge "Don't let NAW.mNetworkInfo escape" am: 6e8c64b349

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455976

Change-Id: I01ef40f341c653a524ee4565c3d9bf2564e0f98f
tree: a9cf86a281ebff4b13f6c6240313b121cc5209fb
  1. core/
  2. services/
  3. tests/