Merge "MAP: Cleanup PendingIntent in cancelUserTimeoutAlarm."