Merge "Fix null PendingIntent in network listens" am: 27a942cb32

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1748153

Change-Id: I85ac14015149779efd3a2d009fffbad31881ab97