Merge changes from topic "am-5ff3768a92d443d1939e70a1909e20ed" into android12-tests-dev

* changes:
  Merge "simpleperf: Loose time constraint to fix flaky test." into android11-tests-dev am: a3e6140e6a
  simpleperf: Loose time constraint to fix flaky test. am: 79810fc160