Merge "Revert "dumpstate: Always vibrate, even in DND"" am: 1453e8a259 am: c5c8b2cdb5 am: 9246f4bea7
am: 8c64fb6a8a

Change-Id: Ic04e63c381917efbb8b5da611d8812457d08eacf