Merge "Fix ManualBenchmarkState iteration unit" into tm-dev am: 1c51fb46 am: 28149c35 am: b3dfec5c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18097689



Change-Id: I73c923dd639a8d3038140d37a1e3949a328c4552
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>