[automerger skipped] Merge "Use BinderDeathDispatcher for alarm listeners" am:...

[automerger skipped] Merge "Use BinderDeathDispatcher for alarm listeners" am: da915abc am: cb35d441 -s ours am: f128f6bc -s ours am: cafbd21c -s ours

am skip reason: Merged-In Ieea2d8f4e495a4c4687378db9d0b8c6949a0406a with SHA-1 f25a5183 is already in history

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

Change-Id: I05cd5dd3b1929e5b9d80ade898c3c1d1f62b3ed1