Merge "Fix failure in scoring test caused by timeout" am: 3e70e4ae97

Original change: https://android-review.googlesource.com/c/platform/test/mlts/benchmark/+/1391256

Change-Id: Ia817a0bbf29d14351920b5da017b8876fdd1e08e