Merge "Use `timeout -i` to distinguish cases where logcat is making progress." am: 6c621084

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2178436



Change-Id: I0f285396e91faba12a6d10f51fe72e9d71ef0909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>