Merge "Fix WTF in PendingIntentRecord.unregisterCancelListenerLocked()" into pi-dev
am: 16fb966442

Change-Id: I5308791dfb3a8fc7138e4dc3af0acef308d5010e