Merge "Dumpstate should hold a wakelock to save bug report time." into cw-f-dev
am: 64076bac3f

Change-Id: Ia1f4644556e9f5632b5ce23b6379a43a2d1cba1c