[automerger skipped] Merge changes I942f4451,Ic31c2afd am: d406ec6cbb am: 9297a9a2f2 -s ours am: b8f042db3a -s ours am: 096a7b0af3 -s ours

am skip reason: Change-Id I942f4451ba3a25ab13c7f7d856b756c831eceb53 with SHA-1 6810c9b37b is in history

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

Change-Id: Id8c3f6039317c4bcb374614506b3476c132ff653