Merge "Cancel NotificationTimeout alarms when canceling notification" am: 9e7ac57a6c

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

Change-Id: I51cc9a62275b8a4f28365b619e74cd96cc7b58f6