Merge "Revert "Hold a wakelock during dumpstate."" into cw-f-dev
am: 2f7d559195

Change-Id: I1b8d074dbbecb36d88d66cf155c015c5ff4c49d9