[automerger skipped] Merge "Fix failure in scoring test caused by timeout" am: 3e70e4ae97 am: 0da56bec6c -s ours

am skip reason: Change-Id I6c9d48330f599256006b3dda37078df5a8288469 with SHA-1 4a94ab83d5 is in history

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

Change-Id: I7ff5c4ad43f0471acd391fee36033c92e770fe92