Merge "simpleperf: Dump data when app option test fails" am: 2ce63a2a56 am: f02aeef540 am: fd3512d24e

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

Change-Id: I146991a109aec1ed1156e9e20a30ccad17a13bb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>