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

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

Change-Id: I61f071d524c259d4b510577d8719786ec5b17e9a