[automerger skipped] Merge "Remove cancel listeners from pending intent...
[automerger skipped] Merge "Remove cancel listeners from pending intent alarms" into qt-qpr1-dev am: c2ce0ac9
am: 13339167 -s ours
am skip reason: change_id I65df12da0c437064e6e3719911926738c677c4eb with SHA1 0d51a8bc is in history
Change-Id: I01528d273b2bd6b53af55f467d0f9518c1b91576