[automerger skipped] Merge "Fix network callback with the same PendingIntent does not release" into sc-dev am: 8ba13e99e8 -s ours

am skip reason: Merged-In I38bdea3a026a78a6dc34b5200d43a75b3cd1ac0c with SHA-1 1cc3f17413 is already in history

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

Change-Id: I0ad874b68ddada87348c5279ace98eae433211bc