Merge "Revert "dumpstate: Always vibrate, even in DND"" am: 1453e8a259
am: c5c8b2cdb5

Change-Id: I9e2907791a4dc9fb71365dcaf7399c4cb381e97f