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

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

Change-Id: I853acb6a69dd9878cd806c6ee41fd1658e0f8ddc