Merge "simpleperf: add context_switch msg type in report_sample output." am: 1a25748ddd am: b10ceff02c

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

Change-Id: I2c53ad89128aad4dc374908f389d466cdc5331c4