am 3a6a953c: am 2ab05fc5: Merge "dumpstate: modify logcat timeout to compensate for storage speed"

* commit '3a6a953ccc09cf70f11000e98d8639fcf934cbc0':
  dumpstate: modify logcat timeout to compensate for storage speed