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

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

Change-Id: I407e137259e9ee5fdd510db0b3cb46f0c8f92d04