Merge "Fix WTF in PendingIntentRecord.unregisterCancelListenerLocked()" into pi-dev