[automerger skipped] Merge "Don't cancel PendingIntents unless the...

[automerger skipped] Merge "Don't cancel PendingIntents unless the stay_stopped flag is on." into 24D1-dev am: f4781550 -s ours

am skip reason: Merged-In I186f43ca0736072ab8f235e448deff304dda84cb with SHA-1 63d69924 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27619050



Change-Id: I69de1360ccd807b8aa7cb2bb29d6885371d01ab7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>