[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: 250e7f137d -s ours

am skip reason: Change-Id If2a5435fe9fdce6a241d0a9d2208f353a67e7aa3 with SHA-1 52adb15003 is in history

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

Change-Id: I3c3db26cb35430b4d277879592e3385772012b13