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: I19219da414ef75e519c5a03f8590ff5cabcc9b71