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

Change-Id: Id800acdd5813607a6f2e42026c1e7c51ab0f0579