Merge "Don't suppress haptic feedback on keyguard anymore." into lmp-dev