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

Change-Id: I08b640b8c1ffae80205be5dcf179403c335e43ba