Merge "Merge "Use `timeout -i` to distinguish cases where logcat is making...

Merge "Merge "Use `timeout -i` to distinguish cases where logcat is making progress." am: 6c621084 am: b67d6e52 am: 540cc694 am: c76ee30f" into tm-qpr-dev-plus-aosp am: 4b98ed57

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



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