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

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

Change-Id: I8a9899d9a5d7eba8423cbba99f085174ae383e6a