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

Change-Id: Ie79e1b5076e45c2975a437b35852ca28e18f11e5