Merge "simpleperf: use proguard mapping file for compiled java symbols." am: fdb8b12245 am: 5572d29885

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

Change-Id: I66e5e8dbef8f9cb7d0bb151bae26c8ab8e8190ee