Merge changes from topic "am-1ea4a23d68d44c7d84ed87e3618c6553" into android12-tests-dev

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