DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time." am: bb6b604623
am: dfc9df466f

Change-Id: I811887b84ada7e44745548064926f0bfd9f3ad57