Merge "Fix network callback with the same PendingIntent does not release" am: 6d908a513a

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

Change-Id: I37b87ca482c8b77444bcb0d0ba575be61ab7d3ad