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

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

Change-Id: Ied244fadf461a1147e85fbd02bdf945672e5d6b8