Merge "simpleperf: update test for --trace-offcpu." am: 2cc193fe31 am: e44c172008

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

Change-Id: Ib495d8b74f44cd8689aa29fcc5d0eb8e54b42d01