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

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1723290

Change-Id: I1b7352a3bc320e99eeffda158ee8c2c86bc434a0