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

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

Change-Id: Idd67d98eaafd2c9b98a4651d18aa23c15b99ee1e