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

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

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



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