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

Change-Id: I5306cb7a1e8e9b3a377922285cfec5682ee3ed63