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

* commit '2efacef121a680f2f180cab63601d96879345d06':
  dumpstate: modify logcat timeout to compensate for storage speed