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

Change-Id: If09d887f1bc24025a42c88bb9a9e11ba8bbbb05f