Merge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."" into nyc-mr1-dev am: 7781eccbc3
am: dca861e167

Change-Id: I3f03bee749bde460029a6f27ad57897fe4b38115