Merge "[automerger skipped] Merge "simpleperf: increase record duration" into android10-tests-dev am: f33a791c40 -s ours" into android11-tests-dev