Merge "Send a Network instead of network id for wifi no internet dialog" am: 8ce1fa2313 am: dd535a61fc am: 6c7233c57e

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

Change-Id: I54259f3084560fe457e3108dee815d0e305675c2