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

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

Change-Id: I4cff81ddbbfb6d5b250ed210399ef72619daf8e1