Dumpstate should hold a wakelock to save bug report time. DO NOT MERGE.
am: 2cc37eaaa7

Change-Id: Ic58338aaf3dd67b9256e42fe4d61416b35c367de