[automerger skipped] Merge changes I4fd5e3bd,I4d2994d5 am: abc8344cc1 am: 564ecadb24 -s ours am: a81fc95b44 -s ours am: 24f060fe0b -s ours

am skip reason: Change-Id I4fd5e3bde68d72ec78858bc8ce2f7d7c8a1cf1d6 with SHA-1 f59a1aecd2 is in history

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

Change-Id: I6bf54f68458b14ec0dc76e69889577db17f6a276