Merge "Copy predump file's output in case of timeout" into udc-dev am: d2829c9c am: d6444996

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



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