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

Change-Id: I116dc49b72247c138255378ae9d436e5bc89bd69