Merge "dumpstate: calculate logcat timeout using readable buffer size" am: e282bbba65

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

Change-Id: I2924693246624293d524ae0d91617f2a2434d84e