Merge "Fix network callback with the same PendingIntent does not release" into sc-dev am: 8ba13e99e8

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

Change-Id: Ic875052f9a045c32a19457fa5d154b1502a6a1ab