Merge "simpleperf: update trace offcpu modes." am: 1726e401bf am: bde2f12f36

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

Change-Id: Ia62b15ff712ab0ca860bcba01c77a4de2e7db908