Merge "Unlink listener death recipient on alarms" into sc-dev am: 18cdcb66 am: 0ba88ca2 am: da03344e

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

Change-Id: I73a002c1c9cfdefc49a9c7c2f019f62e19eea07e