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

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

Change-Id: Ib6039186d7904492ea88316df57d441ad36d2273