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
am: 61fd9f386e  -s ours

Change-Id: Ia2b4d504c4b91f5d466ae7776a62d67475ebe650