Merge "simpleperf: fix pprof_proto_generator.py for proguard mapping file." am: 55c3b615d6 am: 6184d0acde

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

Change-Id: I075d5989c59ee622284998f87406b7839fc156c9