dumpstate: increase logcat timeout to 40 seconds (DO NOT MERGE) am: 03d61d95fa am: dc482d7711  -s ours
am: b1000f209e  -s ours

* commit 'b1000f209e10ea4710e924c4c97a1990f53dd90e':
  dumpstate: increase logcat timeout to 40 seconds (DO NOT MERGE)