Merge "Revert "Revert "dumpstate: Always vibrate, even in DND""" am: 6791760e49
am: 41c3d5fb6a

Change-Id: Id05c54d95cf6273e8489370046bc621b1d223e3e