Merge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug...
Merge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."" into nyc-mr1-dev am: 7781eccb am: dca861e1 am: f97bd913
am: 98cf2f77 -s ours
Change-Id: Ie79e1b5076e45c2975a437b35852ca28e18f11e5