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

Change-Id: Ic40e7d9a2c4df64af47d80079202e7dc36d649a0