[automerger skipped] Merge "Revert "Use BinderDeathDispatcher for alarm...

[automerger skipped] Merge "Revert "Use BinderDeathDispatcher for alarm listeners"" am: 9c8ba975 am: 7fafb46a -s ours

am skip reason: Merged-In I390d9bba37a4040b7e789e0ae04f9980fbed5c12 with SHA-1 b4da4f36 is already in history

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

Change-Id: I0dc45e1fb41cc669c8657ab41a9cd26a4974c654