Merge "Log if keymaster IPC takes too long"