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

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

Change-Id: I1428a4bf9be18601ff70e8fc50e06fecac158a4b