Merge "Remove alarms of cancelled pending intents" into qt-dev am: 32cff1c2d4 am: de9f3853b7
am: 531af71b24

Change-Id: Id08be95d0065ea7ea05ff587493bbf6144ece4da