Merge "Merge "simpleperf: increase record duration" into android11-tests-dev am: 26d94ee676" into android12-tests-dev