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

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

Change-Id: I43259e81dbeb614782bd22c31a0e5d6470a154c1