Merge "dumpstate: calculate logcat timeout using readable buffer size" am: e282bbba65 am: 60f4b551a9 am: e3f1db2239 am: ae91abdd35 am: fc2c0c3250

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1391122

Change-Id: I11210e68c930efe80f4e04d95557aed64b9edf7b