Merge "Don't let NAW.mNetworkInfo escape" am: 60b3b9e7a3 am: 24f5bae9c0 am: c9f402b6a3

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

Change-Id: I5811b1c40540123b0d6446f8af7638ce2eac6d99