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

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



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