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

Change-Id: I23913c8c911c646b20b91b4b0e937261c6a28863