Merge "Add a max timeout to output to Utils since we observe some hanging sometimes" am: eab583a0d3 am: b0d58078db am: 6ce25d4d27

Original change: https://android-review.googlesource.com/c/platform/cts/+/2524035

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