Merge "Remove cancel listeners from pending intent alarms" into qt-qpr1-dev
am: c2ce0ac905

Change-Id: Ibd4275ef993f7b4b77e15212194b58bef2af9e1c