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

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

Change-Id: I4d724322b87365f1b58c0c7acbc813288b51ec8d