Merge changes from topic "am-e9cc26aa52074db0a6d764cfe3878879" into main

* changes:
  Merge changes from topic "am-58ca7d8a2c394672818c16262cc7b67b" into android14-tests-dev am: 8961961b84 -s ours
  [automerger skipped] Merge "Merge "Merge "simpleperf: Fix record_cmd#check_trampoline test" into android12-tests-dev am: 927e0ca800" into android12L-tests-dev am: d9fb8dd703" into android13-tests-dev am: bc87a068b5 -s ours am: 39f3b7a553 -s ours